From 1335a986c8e0a4382c91f66a5718cbdd6d4d9274 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Wed, 5 Feb 2020 18:16:57 +0100 Subject: openldap: enable sha2 and pbkdf2 modules --- pkgs/development/libraries/openldap/default.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/openldap') diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index fbc9de11e8f73..fa26a0dc4d16c 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { # Disable install stripping as it breaks cross-compiling. # We strip binaries anyway in fixupPhase. - makeFlags= [ "STRIP=" ]; + makeFlags= [ + "STRIP=" + "prefix=$(out)" + "moduledir=$(out)/lib/modules" + ]; configureFlags = [ "--enable-overlays" @@ -35,9 +39,18 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + postBuild = '' + make $makeFlags -C contrib/slapd-modules/passwd/sha2 + make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2 + ''; + doCheck = false; # needs a running LDAP server - installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ]; + installFlags = [ + "sysconfdir=$(out)/etc" + "localstatedir=$(out)/var" + "moduledir=$(out)/lib/modules" + ]; # 1. Fixup broken libtool # 2. Libraries left in the build location confuse `patchelf --shrink-rpath` @@ -51,9 +64,12 @@ stdenv.mkDerivation rec { rm -rf $out/var rm -r libraries/*/.libs + rm -r contrib/slapd-modules/passwd/*/.libs ''; postInstall = '' + make $installFlags install -C contrib/slapd-modules/passwd/sha2 + make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2 chmod +x "$out"/lib/*.{so,dylib} ''; -- cgit 1.4.1