From a0625f70f5a2fed7651aefaf3bed81d8d79f395f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:00 +0200 Subject: [PATCH] gnu: pd: Use G-expressions. * gnu/packages/music.scm (pd)[arguments]: Rewrite as G-expressions, and use SEARCH-INPUT-FILE. --- gnu/packages/music.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 43290bb0ae..aaa8657d27 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2707,19 +2707,21 @@ (define-public pd (arguments (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) " "))))))))) + (list + #:tests? #f ; no "check" target + #:configure-flags + #~(list + "--enable-jack" + (string-append "--with-wish=" + (search-input-file %build-inputs + (string-append "/bin/" #$wish)))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-wish-path + (lambda _ + (substitute* "tcl/pd-gui.tcl" + (("exec wish ") + (string-append "exec " (which #$wish) " "))))))))) (native-inputs (list autoconf automake libtool gettext-minimal pkg-config)) (inputs