TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki 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 @@ (define-public strawberry
(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 @@ (define-public strawberry
#: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