Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

openldap: fix cross-build

authored by

Jörg Thalheim and committed by
Robin Gloster
2ebe19f3 10ba7875

+20 -11
+20 -11
pkgs/development/libraries/openldap/default.nix
··· 13 13 14 14 enableParallelBuilding = true; 15 15 16 - buildInputs = [ openssl cyrus_sasl db groff libtool ]; 16 + nativeBuildInputs = [ groff ]; 17 + 18 + buildInputs = [ openssl cyrus_sasl db libtool ]; 19 + 20 + # Disable install stripping as it breaks cross-compiling. 21 + # We strip binaries anyway in fixupPhase. 22 + makeFlags= [ "STRIP=" ]; 17 23 18 - configureFlags = 19 - [ "--enable-overlays" 20 - "--disable-dependency-tracking" # speeds up one-time build 21 - "--enable-modules" 22 - "--sysconfdir=/etc" 23 - "--localstatedir=/var" 24 - "--enable-crypt" 25 - ] ++ stdenv.lib.optional (openssl == null) "--without-tls" 26 - ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" 27 - ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; 24 + configureFlags = [ 25 + "--enable-overlays" 26 + "--disable-dependency-tracking" # speeds up one-time build 27 + "--enable-modules" 28 + "--sysconfdir=/etc" 29 + "--localstatedir=/var" 30 + "--enable-crypt" 31 + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 32 + "--with-yielding_select=yes" 33 + "ac_cv_func_memcmp_working=yes" 34 + ] ++ stdenv.lib.optional (openssl == null) "--without-tls" 35 + ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" 36 + ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; 28 37 29 38 doCheck = false; # needs a running LDAP server 30 39