public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:49:22 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/pngcheck/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
makefile = "Makefile.unx";
makeFlags = "ZPATH=${zlib}/lib";
makeFlags = "ZPATH=${zlib.out}/lib";
buildInputs = [ zlib ];