me/guix
Archived
1
0
Fork 0
Code Activity

gnu: strawberry: Use gexps and remove input labels.

Browse source 
* gnu/packages/music.scm (strawberry) [arguments]: Use gexps.
Use search-input-file in wrap-program and pre-check phases.
This commit is contained in:
Maxim Cournoyer 2023-04-02 22:05:20 -04:00
parent e566c4bc11
commit 3d01c420c1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/music.scm
View file

@ -569,8 +569,8 @@ you create custom user interfaces for your MIDI hardware.")
(let ((bundled '("singleapplication"))) (let ((bundled '("singleapplication")))
(if (not (if (not
(string-match (string-match
(string-append ".?*(" (string-join bundled "|") ")") (string-append ".?*(" (string-join bundled "|") ")")
dir)) dir))
(delete-file-recursively dir)))) (delete-file-recursively dir))))
(find-files "3rdparty" (find-files "3rdparty"
(lambda (file stat) (lambda (file stat)
@ -582,23 +582,23 @@ you create custom user interfaces for your MIDI hardware.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (wrap-program (search-input-file outputs "bin/strawberry")
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
(wrap-program (string-append out "/bin/strawberry") (,(getenv "GST_PLUGIN_SYSTEM_PATH"))))))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server"))) (system (format #f "~a :1 &"
(system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (search-input-file (or native-inputs inputs)
(setenv "DISPLAY" ":1") "bin/Xvfb")))
(setenv "HOME" (getcwd)))))))) (setenv "DISPLAY" ":1")
(setenv "HOME" (getcwd)))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal
("googletest" ,googletest) googletest
("pkg-config" ,pkg-config) pkg-config
("qtlinguist" ,qttools) qttools
("xorg-server" ,xorg-server-for-tests))) xorg-server-for-tests))
(inputs (inputs
(list alsa-lib (list alsa-lib
boost boost