01/02: gnu: 389-ds-base: Restore definition of pythondir.

[guix-commits]

rekado pushed a commit to branch core-updates-frozen
in repository guix.

commit 6cd6b0abe74d74e4aea81ffdf2c46858a0b20d93
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Thu Sep 30 14:56:04 2021 +0200

    gnu: 389-ds-base: Restore definition of pythondir.
    
    * 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.
---
 gnu/packages/openldap.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index 861568c..5a56028 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -229,7 +229,7 @@ servers from Python programs.")
      `(#:modules ((srfi srfi-1)
                   (guix build gnu-build-system)
                   ((guix build python-build-system)
-                   #:select (add-installed-pythonpath))
+                   #:select (add-installed-pythonpath python-version))
                   (guix build utils))
        #:imported-modules ((guix build python-build-system)
                            ,@%gnu-build-system-modules)
@@ -282,7 +282,11 @@ servers from Python programs.")
                   "etc_dirsrv_path = '/etc/dirsrv/'\n")))))
          (add-after 'unpack 'fix-install-location-of-python-tools
            (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.
                (add-installed-pythonpath inputs outputs)
                ;; Install directory must exist.