mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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.
This commit is contained in:
parent
96239e9aeb
commit
65cdd4287b
1 changed files with 17 additions and 17 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue