[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/163: gnu: carla: Adjust wrap phase.
From: |
guix-commits |
Subject: |
13/163: gnu: carla: Adjust wrap phase. |
Date: |
Mon, 25 Jan 2021 02:01:17 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 3f813ef1d392392fd9b8db61cb10bda9a4740d31
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 11:29:51 2021 -0500
gnu: carla: Adjust wrap phase.
* gnu/packages/audio.scm (carla): Import required modules and adjust
the wrap phase to use guix-pythonpath instead of PYTHONPATH.
---
gnu/packages/audio.scm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index d3398ea..a55cc35 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4563,7 +4563,12 @@ as is the case with audio plugins.")
"0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no "check" target
+ `(#:imported-modules ,(cons '(guix build python-build-system)
+ %gnu-build-system-modules)
+ #:modules ((guix build gnu-build-system)
+ ((guix build python-build-system) #:select (guix-pythonpath))
+ (guix build utils))
+ #:tests? #f ; no "check" target
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
@@ -4579,11 +4584,12 @@ as is the case with audio plugins.")
(chmod (string-append out "/share/carla/carla") #o555)
#t)))
(add-after 'install 'wrap-executables
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (pythonpath (guix-pythonpath inputs)))
(wrap-script (string-append out "/bin/carla")
- `("PYTHONPATH" ":" prefix (,(getenv
"PYTHONPATH"))))
- #t))))))
+ `(,pythonpath ":" prefix
+ (,(getenv pythonpath))))))))))
(inputs
`(("alsa-lib" ,alsa-lib)
("ffmpeg" ,ffmpeg)
- 86/163: gnu: mpdris2: Wrap with the new Guix PYTHONPATH., (continued)
- 86/163: gnu: mpdris2: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 94/163: gnu: python-pure-protobuf: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 113/163: gnu: authenticator: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 108/163: gnu: eolie: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 92/163: gnu: fenics: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 100/163: gnu: patchwork: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 125/163: gnu: python-pymediainfo: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 120/163: gnu: python-attrs: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 132/163: gnu: python-jinja2: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 06/163: build/python: Add the installation bin directory to PATH., guix-commits, 2021/01/25
- 13/163: gnu: carla: Adjust wrap phase.,
guix-commits <=
- 16/163: gnu: python-pysam: Adjust following Python build system changes., guix-commits, 2021/01/25
- 38/163: gnu: git-imerge: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 36/163: gnu: cgit: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 50/163: gnu: econnman: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 32/163: gnu: behave: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 53/163: gnu: ibus-libpinyin: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 02/163: gnu: python: Replace PYTHONPATH by GUIX_PYTHONPATH_X_Y., guix-commits, 2021/01/25
- 122/163: gnu: python-stone: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 143/163: gnu: python-binwalk: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 154/163: gnu: python-aiohttp: Do not set PYTHONPATH., guix-commits, 2021/01/25