Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
711 changed files with 49079 additions and 11672 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
, writeText
, writeText, gcc
}:
with stdenv.lib;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
preConfigure = "cd src";
configureFlags = [ "--disable-native-macro" ];
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ];
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ];