~ruther/guix-local

d801827b846d9cde9e93797c20600651697b111a — Marius Bakke 4 years ago 846bd3d
gnu: ganeti: Add the output directory on GUIX_PYTHONPATH.

This is a follow-up to commit 1ed567c8721ec2810fdb70f1c6fc8396a705d503.

* gnu/packages/virtualization.scm (ganeti)[arguments]: Adjust wrap phase to
include Ganetis own site-packages on $GUIX_PYTHONPATH.
1 files changed, 6 insertions(+), 3 deletions(-)

M gnu/packages/virtualization.scm
M gnu/packages/virtualization.scm => gnu/packages/virtualization.scm +6 -3
@@ 529,6 529,7 @@ firmware blobs.  You can
                           (guix build python-build-system))
       #:modules (,@%gnu-build-system-modules
                  ((guix build haskell-build-system) #:prefix haskell:)
                  ((guix build python-build-system) #:select (site-packages))
                  (srfi srfi-1)
                  (srfi srfi-26)
                  (ice-9 match)


@@ 742,10 743,12 @@ firmware blobs.  You can
         ;; the phase from python-build-system because we also need to wrap
         ;; the scripts in $out/lib/ganeti such as "node-daemon-setup".
         (add-after 'install 'wrap
           (lambda* (#:key outputs #:allow-other-keys)
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
                    (sbin (string-append out "/sbin"))
                    (lib (string-append out "/lib")))
                    (lib (string-append out "/lib"))
                    (PYTHONPATH (string-append (site-packages inputs outputs)
                                               ":" (getenv "GUIX_PYTHONPATH"))))
               (define (shell-script? file)
                 (call-with-ascii-input-file file
                   (lambda (port)


@@ 767,7 770,7 @@ firmware blobs.  You can
               (for-each (lambda (file)
                           (wrap-program file
                             `("GUIX_PYTHONPATH" ":" prefix
                               (,(getenv "GUIX_PYTHONPATH")))))
                               (,PYTHONPATH))))
                         (append-map (cut find-files <> wrap?)
                                     (list (string-append lib "/ganeti")
                                           sbin)))))))))