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

This commit is contained in:
Robin Gloster
2016-04-18 13:49:22 +00:00
1369 changed files with 35810 additions and 10571 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";
NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11";
patches =
let