guix-commits
[Top][All Lists]
Advanced

[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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]