diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-07-22 00:26:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 00:26:32 +0200 |
| commit | 457d109dcd4ce568bbe17bf7a6f741ebaccd1334 (patch) | |
| tree | 1df44386d49f1307f43e75cb67c1b7443ffb7cc5 /pkgs/development/libraries/openldap | |
| parent | 97a9f89dfed84f8dcc8e9e17ae99ae6a2aa7b852 (diff) | |
| parent | 60d1c1d9ad3717150fc38bd2b1b974b511cd17b4 (diff) | |
| download | nixpkgs-457d109dcd4ce568bbe17bf7a6f741ebaccd1334.tar nixpkgs-457d109dcd4ce568bbe17bf7a6f741ebaccd1334.tar.gz nixpkgs-457d109dcd4ce568bbe17bf7a6f741ebaccd1334.tar.bz2 nixpkgs-457d109dcd4ce568bbe17bf7a6f741ebaccd1334.tar.lz nixpkgs-457d109dcd4ce568bbe17bf7a6f741ebaccd1334.tar.xz nixpkgs-457d109dcd4ce568bbe17bf7a6f741ebaccd1334.tar.zst nixpkgs-457d109dcd4ce568bbe17bf7a6f741ebaccd1334.zip | |
Merge pull request #179597 from Mic92/openldap-path
[staging] openldap: remove deprecated options, improve encapsulation
Diffstat (limited to 'pkgs/development/libraries/openldap')
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 8 |
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..80c226a1058 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/openldap/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 = [ |