From: Sughosha via Guix-patches via <guix-patches@gnu.org>
To: 64374@debbugs.gnu.org
Cc: Sughosha <sughosha@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 [thread overview]
Message-ID: <7d3a663f9e847009e20a2161227faa33daca91df.1688416868.git.sughosha@disroot.org> (raw)
In-Reply-To: <d0bfbab5a54924ecb9d780ab17fba4fea1457063.1688416868.git.sughosha@disroot.org>
* 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
next prev parent reply other threads:[~2023-07-03 20:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 19:59 [bug#64374] [PATCH] gnu: ardour: Update to 7.5 Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 1/3] " Sughosha via Guix-patches via
2023-07-03 20:52 ` [bug#64374] [PATCH v2 2/3] gnu: ardour: Install bundled MIDI loops Sughosha via Guix-patches via
2023-07-03 20:52 ` Sughosha via Guix-patches via [this message]
2023-07-18 12:27 ` bug#64374: [PATCH] gnu: ardour: Update to 7.5 宋文武 via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7d3a663f9e847009e20a2161227faa33daca91df.1688416868.git.sughosha@disroot.org \
--to=guix-patches@gnu.org \
--cc=64374@debbugs.gnu.org \
--cc=sughosha@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.