mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-11 06:11:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: 389-ds-base: Restore definition of pythondir.

Browse source 
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Import python-version
from (guix build python-build-system); define pythondir before using it in
fix-install-location-of-python-tools.
This commit is contained in:
Ricardo Wurmus 2021-09-30 14:56:04 +02:00
parent 2bec19199e
commit 6cd6b0abe7
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/openldap.scm
View file

@ -229,7 +229,7 @@ servers from Python programs.")
`(#:modules ((srfi srfi-1) `(#:modules ((srfi srfi-1)
(guix build gnu-build-system) (guix build gnu-build-system)
((guix build python-build-system) ((guix build python-build-system)
#:select (add-installed-pythonpath)) #:select (add-installed-pythonpath python-version))
(guix build utils)) (guix build utils))
#:imported-modules ((guix build python-build-system) #:imported-modules ((guix build python-build-system)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
@ -282,7 +282,11 @@ servers from Python programs.")
"etc_dirsrv_path = '/etc/dirsrv/'\n"))))) "etc_dirsrv_path = '/etc/dirsrv/'\n")))))
(add-after 'unpack 'fix-install-location-of-python-tools (add-after 'unpack 'fix-install-location-of-python-tools
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out"))
(pythondir (string-append
out "/lib/python"
(python-version (assoc-ref inputs "python"))
"/site-packages/")))
;; Install directory must be on PYTHONPATH. ;; Install directory must be on PYTHONPATH.
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
;; Install directory must exist. ;; Install directory must exist.