14/17: gnu: pd: Don't hard-code Tk version.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 98f08a99c6a0fefeca043cfac1fd89be8deebe5f
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed Jun 10 03:38:28 2020 +0200

    gnu: pd: Don't hard-code Tk version.
    
    * gnu/packages/music.scm (pd)[arguments]: Construct the wish file name from 
the tk package version.
---
 gnu/packages/music.scm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index f222075..beecdcc 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1892,20 +1892,22 @@ export.")
                 "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no "check" target
-       #:configure-flags
-       (list
-        "--enable-jack"
-        (string-append "--with-wish=" (string-append
-                                       (assoc-ref %build-inputs "tk")
-                                       "/bin/wish8.6")))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'fix-with-path
-           (lambda _
-             (substitute* "tcl/pd-gui.tcl"
-               (("exec wish ") (string-append "exec " (which "wish8.6") " ")))
-             #t)))))
+     (let ((wish (string-append "wish" (version-major+minor
+                                        (package-version tk)))))
+       `(#:tests? #f                    ; no "check" target
+         #:configure-flags
+         (list
+          "--enable-jack"
+          (string-append "--with-wish=" (string-append
+                                         (assoc-ref %build-inputs "tk")
+                                         "/bin/" ,wish)))
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'configure 'fix-with-path
+             (lambda _
+               (substitute* "tcl/pd-gui.tcl"
+                 (("exec wish ") (string-append "exec " (which ,wish) " ")))
+               #t))))))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)