GNU bug report logs - #64374
[PATCH] gnu: ardour: Update to 7.5.

Previous Next

Full log

View this message in rfc822 format

From: Sughosha <sughosha <at> disroot.org>
To: 64374 <at> debbugs.gnu.org
Cc: Sughosha <sughosha <at> disroot.org>
Subject: [bug#64374] [PATCH v2 3/3] gnu: ardour: Move ardour-rpath-phase inside this definition.
Date: Mon,  3 Jul 2023 22:52:19 +0200

* gnu/packages/audio.scm (ardour)[#:phases]: Move ardour-rpath-phase
inside this definition.
(ardour-rpath-phase): Delete variable.
---
 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 25fa8acf33..b08827b133 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -720,21 +720,6 @@ (define-public qm-dsp
 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)
@@ -776,7 +761,20 @@ (define-public ardour
        #: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"))
-- 
2.40.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.