Merge pull request #33575 from dtzWill/fix/cross-1

Minor cross fixes, 1
2018-01-09 12:34:50 -05:00
parent 73303b592d 6db707fe7e
commit 0c16a11c9a
7 changed files with 36 additions and 16 deletions
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -22,7 +22,12 @@ stdenv.mkDerivation rec {
  outputs = [ "out" "dev" ];

  configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"]
-    ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
+    ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""''
+    ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform)
+       [ "krb5_cv_attr_constructor_destructor=yes,yes"
+         "ac_cv_func_regcomp=yes"
+         "ac_cv_printf_positional=yes"
+       ];

  nativeBuildInputs = [ pkgconfig perl ]
    ++ optional (!libOnly) yacc