me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* gnu/packages/music.scm (pd)[arguments]: Construct the wish file name from the tk package version.
This commit is contained in:
Tobias Geerinckx-Rice 2020-06-10 03:38:28 +02:00
parent 7801e9f2d4
commit 98f08a99c6
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/music.scm
View file

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