[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/244: gnu: strawberry: Use gexps and remove input labels.
From: |
guix-commits |
Subject: |
29/244: gnu: strawberry: Use gexps and remove input labels. |
Date: |
Wed, 12 Apr 2023 08:47:15 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 3d01c420c1ba3b6c8ecf8af3047cec5335a40df1
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Apr 2 22:05:20 2023 -0400
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.
---
gnu/packages/music.scm | 34 +++++++++++++++++-----------------
1 file 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
- 41/244: gnu: uwufetch: Update to 2.1., (continued)
- 41/244: gnu: uwufetch: Update to 2.1., guix-commits, 2023/04/12
- 22/244: gnu: endless-sky: Update to 0.10.0., guix-commits, 2023/04/12
- 53/244: doc: Add a reference to a page explaining consensus decision making., guix-commits, 2023/04/12
- 36/244: gnu: fheroes2: Update to 1.0.2., guix-commits, 2023/04/12
- 39/244: gnu: drawing: Update to 1.0.2., guix-commits, 2023/04/12
- 42/244: gnu: genie: Update to 1170., guix-commits, 2023/04/12
- 45/244: gnu: emacs-eshell-syntax-highlighting: Update to 0.4., guix-commits, 2023/04/12
- 25/244: gnu: Add pdpmake., guix-commits, 2023/04/12
- 27/244: gnu: emacs-jit-spell: Update to 0.3., guix-commits, 2023/04/12
- 28/244: gnu: strawberry: Update to 1.0.17., guix-commits, 2023/04/12
- 29/244: gnu: strawberry: Use gexps and remove input labels.,
guix-commits <=
- 35/244: gnu: wvkbd: Update to 0.13., guix-commits, 2023/04/12
- 43/244: gnu: emacs-eldoc: Update to 1.14.0., guix-commits, 2023/04/12
- 46/244: gnu: emacs-julia-snail: Update to 1.2.0., guix-commits, 2023/04/12
- 47/244: gnu: python-debian: Patch using snippet. Drop workaround., guix-commits, 2023/04/12
- 50/244: gnu: python-license-expression: Update to 30.1.0., guix-commits, 2023/04/12
- 51/244: gnu: reuse: Update to 1.1.2., guix-commits, 2023/04/12
- 54/244: gnu: python-scikit-rf: Update to 0.26.0., guix-commits, 2023/04/12
- 55/244: gnu: libngspice: Update to 40., guix-commits, 2023/04/12
- 58/244: gnu: mlt: Update to 7.14.0., guix-commits, 2023/04/12
- 59/244: gnu: symengine: Update to 0.10.1., guix-commits, 2023/04/12