amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ganeti: Add the output directory on GUIX_PYTHONPATH.

Browse source 
This is a follow-up to commit 1ed567c872.

* gnu/packages/virtualization.scm (ganeti)[arguments]: Adjust wrap phase to
include Ganetis own site-packages on $GUIX_PYTHONPATH.
This commit is contained in:
Marius Bakke 2021-12-02 20:23:48 +01:00
parent 846bd3d083
commit d801827b84
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/virtualization.scm
View file

@ -529,6 +529,7 @@ firmware blobs. You can
(guix build python-build-system)) (guix build python-build-system))
#:modules (,@%gnu-build-system-modules #:modules (,@%gnu-build-system-modules
((guix build haskell-build-system) #:prefix haskell:) ((guix build haskell-build-system) #:prefix haskell:)
((guix build python-build-system) #:select (site-packages))
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
(ice-9 match) (ice-9 match)
@ -742,10 +743,12 @@ firmware blobs. You can
;; the phase from python-build-system because we also need to wrap ;; the phase from python-build-system because we also need to wrap
;; the scripts in $out/lib/ganeti such as "node-daemon-setup". ;; the scripts in $out/lib/ganeti such as "node-daemon-setup".
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(sbin (string-append out "/sbin")) (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) (define (shell-script? file)
(call-with-ascii-input-file file (call-with-ascii-input-file file
(lambda (port) (lambda (port)
@ -767,7 +770,7 @@ firmware blobs. You can
(for-each (lambda (file) (for-each (lambda (file)
(wrap-program file (wrap-program file
`("GUIX_PYTHONPATH" ":" prefix `("GUIX_PYTHONPATH" ":" prefix
(,(getenv "GUIX_PYTHONPATH"))))) (,PYTHONPATH))))
(append-map (cut find-files <> wrap?) (append-map (cut find-files <> wrap?)
(list (string-append lib "/ganeti") (list (string-append lib "/ganeti")
sbin))))))))) sbin)))))))))