[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
86/163: gnu: mpdris2: Wrap with the new Guix PYTHONPATH.
From: |
guix-commits |
Subject: |
86/163: gnu: mpdris2: Wrap with the new Guix PYTHONPATH. |
Date: |
Mon, 25 Jan 2021 02:01:39 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 4cdb418f7c1e2c14f9accddd7033704c71958262
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 22:55:34 2021 -0500
gnu: mpdris2: Wrap with the new Guix PYTHONPATH.
* gnu/packages/mpd.scm (mpdris2)
[phases]{wrap-program}: Wrap with the new Guix PYTHONPATH.
---
gnu/packages/mpd.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 6066913..4cbf072 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020 Simon Streit <simon@netpanic.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -396,15 +397,19 @@ other MPD frontends.")
(build-system gnu-build-system)
;; Manually wrap the binary, because we’re not using python-build-system.
(arguments
- '(#:phases
+ '(#: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))
+ #:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
- (python-path (getenv "PYTHONPATH")))
+ (pythonpath (guix-pythonpath inputs)))
(wrap-program (string-append out "/bin/mpDris2")
- `("PYTHONPATH" ":" prefix (,python-path)))
- #t))))))
+ `("PYTHONPATH" ":" prefix (,(geten pythonpath))))))))))
(inputs
`(("python-mpd2" ,python-mpd2)
("python-dbus" ,python-dbus)
- 127/163: gnu: python-aenum: Do not set PYTHONPATH., (continued)
- 127/163: gnu: python-aenum: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 133/163: gnu: python-pygithub: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 26/163: gnu: python-xmlschema: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 57/163: gnu: python-pytest-django: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 55/163: gnu: ibus-libhangul: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 42/163: gnu: tensorflow: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 45/163: gnu: liferea: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 68/163: gnu: graphite2: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 63/163: gnu: python-django-url-filter: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 73/163: gnu: itstool: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 86/163: gnu: mpdris2: Wrap with the new Guix PYTHONPATH.,
guix-commits <=
- 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, 2021/01/25