guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

81/163: gnu: kajongg: Wrap with the new Guix PYTHONPATH.


From: guix-commits
Subject: 81/163: gnu: kajongg: Wrap with the new Guix PYTHONPATH.
Date: Mon, 25 Jan 2021 02:01:37 -0500 (EST)

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit ec882b0c0402890eac2a6b9db59008ebd83f1f27
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 22:40:34 2021 -0500

    gnu: kajongg: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/games.scm (kajongg)
    [phases]{wrap}: Wrap with the new Guix PYTHONPATH.  Delete trailing #t.
---
 gnu/packages/games.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b122a62..f070da6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10116,17 +10116,21 @@ This package is part of the KDE games module.")
        (base32 "03fdbnx7zx7vgcxvwd1h1098ks9gq162bwz35fhpyzpynr667m5r"))))
     (build-system qt-build-system)
     (arguments
-     `(#:phases
+     `(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %qt-build-system-modules)
+       #:modules ((guix build qt-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                 (guix build utils))
+       #:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap
-           (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-program (string-append out "/bin/kajongg")
-                 `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
-               #t))))))
+                 `(,pythonpath ":" prefix (,(getenv pythonpath))))))))))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ;("perl" ,perl)
        ("kdoctools" ,kdoctools)))
     (inputs
      `(("kconfig" ,kconfig)



reply via email to

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