Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0eb0b742f0c5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11acf66e0017
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 1, 2019

  1. zlib: enable check and parallel building (#62025)

    * zlib: enable check and parallel building
    
    * Remove empty maintainers line
    bhipple authored and disassembler committed Sep 1, 2019
    Copy the full SHA
    11acf66 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/development/libraries/zlib/default.nix
3 changes: 3 additions & 0 deletions pkgs/development/libraries/zlib/default.nix
Original file line number Diff line number Diff line change
@@ -96,6 +96,9 @@ stdenv.mkDerivation (rec {
"LIBRARY_PATH=$(out)/lib"
];

enableParallelBuilding = true;
doCheck = true;

makeFlags = [
"PREFIX=${stdenv.cc.targetPrefix}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [