guix-commits
[Top][All Lists]
Advanced

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



reply via email to

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