diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm index f56c096..9aa843b 100644 --- a/glicid/packages/openldap.scm +++ b/glicid/packages/openldap.scm @@ -12,6 +12,7 @@ #:use-module (gnu packages linux) #:use-module ((gnu packages openldap) #:prefix gnu:) #:use-module (gnu packages password-utils) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) @@ -19,7 +20,6 @@ (define-public openldap (package - (inherit gnu:openldap) (name "openldap") (version "2.6.0") (source (origin @@ -39,16 +39,24 @@ ) (build-system gnu-build-system) (inputs `( - ("libltdl", libltdl) - ("pkg-config", pkg-config) - ("libevent", libevent) - ("openssl", openssl) ("argon2", argon2) - ("wiredtiger", wiredtiger) - ("snappy", snappy) + ("cyrus-sasl", cyrus-sasl) + ("libevent", libevent) + ("libgcrypt", libgcrypt) + ("libltdl", libltdl) ("lz4", lz4) + ("openssl", openssl) + ("perl", perl) + ("pkg-config", pkg-config) + ("snappy", snappy) ("unixodbc", unixodbc) - ,@(package-inputs gnu:openldap) + ("wiredtiger", wiredtiger) + ("zlib", zlib) + )) + (native-inputs `( + ("bdb-5.3", bdb-5.3) + ("groff", groff) + ("libtool", libtool) )) (arguments '( ; this is needed because the make check does not work inside guix @@ -75,10 +83,8 @@ "--disable-static" "--enable-shared" "--with-tls=openssl" - "--enable-perl=no" ; error with the beck_perl ) #:make-flags '("STRIP=") - #:parallel-build? #f #:phases (modify-phases %standard-phases (add-before 'build 'make-depend (lambda* (#:key input #:allow-other-keys) @@ -170,8 +176,8 @@ ) (inputs `( ("linux-pam", linux-pam) - ("openldap", openldap) ("mit-krb5", mit-krb5) + ("openldap", openldap) ("python", python) )) (home-page "https://arthurdejong.org/nss-pam-ldapd") @@ -185,4 +191,3 @@ an LDAP server.") (license license:lgpl2.1+) ) ) -openldap diff --git a/glicid/packages/perl.scm b/glicid/packages/perl.scm index d990919..e27704c 100644 --- a/glicid/packages/perl.scm +++ b/glicid/packages/perl.scm @@ -19,7 +19,6 @@ (build-system perl-build-system) (arguments '( #:tests? #f - #:parallel-build? #f )) (home-page "https://metacpan.org/release/ExtUtils-Embed") (synopsis "Utilities for embedding Perl in C/C++ applications")