diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-02 22:05:20 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-02 22:05:20 -0400 |
| commit | 65cdd4287b62d69bff6526f2d05536336c1d4cb3 (patch) | |
| tree | 2cfb7be0d638af03bbdb132fee7f45607afa705d | |
| parent | 96239e9aeb4de3187b61d12c398c619d7219f92e (diff) | |
| download | guix-65cdd4287b62d69bff6526f2d05536336c1d4cb3.tar guix-65cdd4287b62d69bff6526f2d05536336c1d4cb3.tar.gz | |
gnu: strawberry: Use gexps and remove input labels.
* gnu/packages/music.scm (strawberry) [arguments]: Use gexps.
Use search-input-file in wrap-program and pre-check phases.
| -rw-r--r-- | gnu/packages/music.scm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 50dacf3b23..ae57600c22 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -569,8 +569,8 @@ you create custom user interfaces for your MIDI hardware.") (let ((bundled '("singleapplication"))) (if (not (string-match - (string-append ".?*(" (string-join bundled "|") ")") - dir)) + (string-append ".?*(" (string-join bundled "|") ")") + dir)) (delete-file-recursively dir)))) (find-files "3rdparty" (lambda (file stat) @@ -582,23 +582,23 @@ you create custom user interfaces for your MIDI hardware.") #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/strawberry") - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))) + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/strawberry") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix + (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))) (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server"))) - (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) - (setenv "DISPLAY" ":1") - (setenv "HOME" (getcwd)))))))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (system (format #f "~a :1 &" + (search-input-file (or native-inputs inputs) + "bin/Xvfb"))) + (setenv "DISPLAY" ":1") + (setenv "HOME" (getcwd))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools) - ("xorg-server" ,xorg-server-for-tests))) + (list gettext-minimal + googletest + pkg-config + qttools + xorg-server-for-tests)) (inputs (list alsa-lib boost |