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-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/compression/zopfli/default.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
})
];
enableParallelBuilding = true;
enableParallelBuilding = false; # problems, easily reproducible
buildFlags = [
"zopfli"
"libzopfli"