guix-commits
[Top][All Lists]
Advanced

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



reply via email to

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