[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/10: gnu: ardour: Inline ardour-rpath-phase into its definition.
From: |
guix-commits |
Subject: |
09/10: gnu: ardour: Inline ardour-rpath-phase into its definition. |
Date: |
Tue, 18 Jul 2023 08:24:39 -0400 (EDT) |
iyzsong pushed a commit to branch master
in repository guix.
commit 3c79f4b50abba1e370da4d2a808cc6bfc4336654
Author: Sughosha <sughosha@disroot.org>
AuthorDate: Mon Jul 3 22:52:19 2023 +0200
gnu: ardour: Inline ardour-rpath-phase into its definition.
* gnu/packages/audio.scm (ardour)[#:phases]: Inline ardour-rpath-phase.
(ardour-rpath-phase): Delete variable.
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
gnu/packages/audio.scm | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 2e2632f356..8a11d2d6cc 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -721,21 +721,6 @@ streams from live audio.")
purposes developed at Queen Mary, University of London.")
(license license:gpl2+)))
-(define (ardour-rpath-phase major-version)
- `(lambda* (#:key outputs #:allow-other-keys)
- (let ((libdir (string-append (assoc-ref outputs "out")
- "/lib/ardour" ,major-version)))
- (substitute* "wscript"
- (("linker_flags = \\[\\]")
- (string-append "linker_flags = [\""
- "-Wl,-rpath="
- libdir ":"
- libdir "/backends" ":"
- libdir "/engines" ":"
- libdir "/panners" ":"
- libdir "/surfaces" ":"
- libdir "/vamp" "\"]"))))))
-
(define ardour-bundled-media
(origin
(method url-fetch)
@@ -777,7 +762,20 @@ namespace ARDOUR { const char* revision = \"" version "\"
; const char* date = \
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-rpath-in-LDFLAGS
- ,(ardour-rpath-phase (version-major version)))
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((libdir (string-append (assoc-ref outputs "out")
+ "/lib/ardour"
+ ,(version-major version))))
+ (substitute* "wscript"
+ (("linker_flags = \\[\\]")
+ (string-append "linker_flags = [\""
+ "-Wl,-rpath="
+ libdir ":"
+ libdir "/backends" ":"
+ libdir "/engines" ":"
+ libdir "/panners" ":"
+ libdir "/surfaces" ":"
+ libdir "/vamp" "\"]"))))))
(add-after 'install 'install-freedesktop-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- branch master updated (d2c6d1d818 -> bd0e7c5e17), guix-commits, 2023/07/18
- 03/10: gnu: libnatpmp: Update to 20230423., guix-commits, 2023/07/18
- 05/10: gnu: mingw-w64-tools: Update to 11.0.0., guix-commits, 2023/07/18
- 08/10: gnu: ardour: Install bundled MIDI loops., guix-commits, 2023/07/18
- 06/10: gnu: nsis: Update to 3.09., guix-commits, 2023/07/18
- 02/10: gnu: libupnp: Update to 1.14.17., guix-commits, 2023/07/18
- 09/10: gnu: ardour: Inline ardour-rpath-phase into its definition.,
guix-commits <=
- 10/10: gnu: zsh: Update to 5.9., guix-commits, 2023/07/18
- 04/10: gnu: mingw: Update to 11.0.0., guix-commits, 2023/07/18
- 01/10: gnu: newick-utils: Skip tests on riscv64-linux., guix-commits, 2023/07/18
- 07/10: gnu: ardour: Update to 7.5., guix-commits, 2023/07/18