Merge pull request #32386 from pbogdan/mono-parallel-build

mono: re-enable parallel building
This commit is contained in:
Austin Seipp 2017-12-06 21:07:33 -06:00 committed by GitHub
commit c2a4baf9f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View File

@ -45,8 +45,7 @@ stdenv.mkDerivation rec {
# The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true;
# Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601
enableParallelBuilding = false;
enableParallelBuilding = true;
# We want pkg-config to take priority over the dlls in the Mono framework and the GAC
# because we control pkg-config

View File

@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
# The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true;
# Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601
enableParallelBuilding = false;
enableParallelBuilding = true;
# We want pkg-config to take priority over the dlls in the Mono framework and the GAC
# because we control pkg-config