diff options
| author | Austin Seipp <aseipp@pobox.com> | 2017-12-06 21:07:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 21:07:33 -0600 |
| commit | c2a4baf9f56313e3748cad7e859b7dbad8675f72 (patch) | |
| tree | b9bc2f172c06b69f1271df50ed164dc5298d84db /pkgs | |
| parent | 08f75f58401a10337555b7013c2649dbd866e049 (diff) | |
| parent | 391485e3b3185b0b1c03ceccbda64085ac26a877 (diff) | |
| download | nixlib-c2a4baf9f56313e3748cad7e859b7dbad8675f72.tar nixlib-c2a4baf9f56313e3748cad7e859b7dbad8675f72.tar.gz nixlib-c2a4baf9f56313e3748cad7e859b7dbad8675f72.tar.bz2 nixlib-c2a4baf9f56313e3748cad7e859b7dbad8675f72.tar.lz nixlib-c2a4baf9f56313e3748cad7e859b7dbad8675f72.tar.xz nixlib-c2a4baf9f56313e3748cad7e859b7dbad8675f72.tar.zst nixlib-c2a4baf9f56313e3748cad7e859b7dbad8675f72.zip | |
Merge pull request #32386 from pbogdan/mono-parallel-build
mono: re-enable parallel building
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/mono/generic-cmake.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/mono/generic.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index f6e3f5a0100b..cdab3787795c 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -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 diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 3bc962859e28..367b05bef5b5 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -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 |