[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: gnu: 389-ds-base: Fix tool references.
From: |
guix-commits |
Subject: |
04/05: gnu: 389-ds-base: Fix tool references. |
Date: |
Wed, 20 Mar 2019 07:20:03 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 19a0a060d2d9540d0f151821227ba8b2fbbd2ef1
Author: Ricardo Wurmus <address@hidden>
Date: Wed Mar 20 11:59:17 2019 +0100
gnu: 389-ds-base: Fix tool references.
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Rename phase
"fix-includes" to "fix-references" and fix references to certutil and
c_rehash.
[inputs]: Add nss:bin.
---
gnu/packages/openldap.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index 878dc0b..6426c30 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -230,10 +230,15 @@ servers from Python programs.")
"--disable-perl")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-includes
+ (add-after 'unpack 'fix-references
(lambda _
(substitute* "include/ldaputil/certmap.h"
(("nss3/cert.h") "nss/cert.h"))
+ (substitute* "src/lib389/lib389/nss_ssl.py"
+ (("'/usr/bin/certutil'")
+ (string-append "'" (which "certutil") "'"))
+ (("'/usr/bin/c_rehash'")
+ (string-append "'" (which "perl") "', '" (which "c_rehash")
"'")))
#t))
(add-after 'unpack 'fix-install-location-of-python-tools
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -305,6 +310,7 @@ servers from Python programs.")
("net-snmp" ,net-snmp)
("nspr" ,nspr)
("nss" ,nss)
+ ("nss:bin" ,nss "bin") ; for certutil
("openldap" ,openldap)
("openssl" ,openssl) ; #included by net-snmp
("pcre" ,pcre)