[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
24/163: gnu: cdemu-client: Wrap with the new Guix PYTHONPATH.
From: |
guix-commits |
Subject: |
24/163: gnu: cdemu-client: Wrap with the new Guix PYTHONPATH. |
Date: |
Mon, 25 Jan 2021 02:01:20 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 6e405a196805fca175dd472a6674f4a69ab01ee7
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 16:42:54 2021 -0500
gnu: cdemu-client: Wrap with the new Guix PYTHONPATH.
* gnu/packages/cdrom.scm (cdemu-client): Delete trailing #t.
[phases]{wrap-program}: Wrap with the new Guix PYTHONPATH.
---
gnu/packages/cdrom.scm | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index a8da7ba..e778465 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -38,6 +39,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system python)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
@@ -1025,22 +1027,25 @@ drive and disc (including CD-ROMs and DVD-ROMs).")
("python-pygobject" ,python-pygobject)
("cdemu-daemon" ,cdemu-daemon)))
(arguments
- ;; No tests.
- `(#:tests? #f
+ `(#:imported-modules ,(cons '(guix build python-build-system)
+ %cmake-build-system-modules)
+ #:modules ((guix build cmake-build-system)
+ ((guix build python-build-system) #:select (guix-pythonpath))
+ (guix build utils))
+ #:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
(add-after 'install 'patch-shebang
(lambda* (#:key outputs #:allow-other-keys)
(patch-shebang (string-append (assoc-ref outputs "out")
- "/bin/cdemu"))
- #t))
+ "/bin/cdemu"))))
(add-after 'patch-shebang 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
- "/bin/cdemu")))
+ "/bin/cdemu"))
+ (pythonpath (guix-pythonpath inputs)))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH"))))
- #t))))))
+ `(,pythonpath = (,(getenv pythonpath))))))))))
(home-page "https://cdemu.sourceforge.io/")
(synopsis "Command-line client for controlling cdemu-daemon")
(description "CDEmu client is a simple command-line client for controlling
- 01/163: utils: Add a version-minor procedure., (continued)
- 01/163: utils: Add a version-minor procedure., guix-commits, 2021/01/25
- 07/163: build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH., guix-commits, 2021/01/25
- 09/163: gnu: dstat: Adjust wrap phase., guix-commits, 2021/01/25
- 10/163: gnu: solaar: Do not read PYTHONPATH from environment., guix-commits, 2021/01/25
- 04/163: build/python: Replace PYTHONPATH by GUIX_PYTHONPATH_X_Y in add-installed-pythonpath., guix-commits, 2021/01/25
- 18/163: gnu: couger: Adjust wrap phase., guix-commits, 2021/01/25
- 11/163: gnu: intel-xed: Adjust build phase., guix-commits, 2021/01/25
- 03/163: build/python: Add a new guix-pythonpath procedure., guix-commits, 2021/01/25
- 22/163: gnu: python-scanpy: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 21/163: gnu: filtlong: Adjust wrap phase., guix-commits, 2021/01/25
- 24/163: gnu: cdemu-client: Wrap with the new Guix PYTHONPATH.,
guix-commits <=
- 25/163: gnu: python-loompy: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 54/163: gnu: ibus-anty: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 58/163: gnu: python-django-contact-form: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 65/163: gnu: kicad: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 62/163: gnu: python-django-statici18n: Do not read PYTHONPATH., guix-commits, 2021/01/25
- 35/163: gnu: gitless: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 41/163: gnu: blanket: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 71/163: gnu: notifymuch: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 97/163: gnu: 389-ds-base: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 104/163: gnu: python-pynacl: Do not set PYTHONPATH., guix-commits, 2021/01/25