summary refs log tree commit diff
path: root/pkgs/development/libraries/openldap
diff options
context:
space:
mode:
authorKai Wohlfahrt <kai.wohlfahrt@gmail.com>2022-06-04 16:39:35 +0100
committerJörg Thalheim <joerg@thalheim.io>2022-06-29 19:59:06 +0200
commitd1f55ce0a462a036f3d54631c24a8f344ad32902 (patch)
treeefe56606f0fce6c4787848e89ca209ed8efc02ff /pkgs/development/libraries/openldap
parent6e6f33ad838a4935fb51684a56f6f27bcc56c4e6 (diff)
downloadnixpkgs-d1f55ce0a462a036f3d54631c24a8f344ad32902.tar
nixpkgs-d1f55ce0a462a036f3d54631c24a8f344ad32902.tar.gz
nixpkgs-d1f55ce0a462a036f3d54631c24a8f344ad32902.tar.bz2
nixpkgs-d1f55ce0a462a036f3d54631c24a8f344ad32902.tar.lz
nixpkgs-d1f55ce0a462a036f3d54631c24a8f344ad32902.tar.xz
nixpkgs-d1f55ce0a462a036f3d54631c24a8f344ad32902.tar.zst
nixpkgs-d1f55ce0a462a036f3d54631c24a8f344ad32902.zip
openldap: change default ldapi directory
By default, this is /run/ldapi, which is not compatible with systemd's
runtime directories. Change it to /run/slapd/ldapi (in library and
server). This makes `ldapi:///` work as a default socket again.
Diffstat (limited to 'pkgs/development/libraries/openldap')
-rw-r--r--pkgs/development/libraries/openldap/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 551a0827eee..4198221e798 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -93,18 +93,18 @@ stdenv.mkDerivation rec {
     "ac_cv_func_memcmp_working=yes"
   ] ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
-  makeFlags = [
+  NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/slapd/ldapi\"" ];
+
+  makeFlags= [
     "CC=${stdenv.cc.targetPrefix}cc"
     "STRIP="  # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase.
+    "STRIP_OPTS="
     "prefix=${placeholder "out"}"
     "sysconfdir=${placeholder "out"}/etc"
     "systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
     # contrib modules require these
     "moduledir=${placeholder "out"}/lib/modules"
     "mandir=${placeholder "out"}/share/man"
-  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    # Can be unconditional, doing it like this to prevent a mass rebuild.
-    "STRIP_OPTS="
   ];
 
   extraContribModules = [