From 0a41fc6b7cba755076b18141c035333ab73bb6de Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 9 Dec 2017 10:51:50 +0000
Subject: mono46, mono48: disable parallel building

See #32386
mono46: https://hydra.nixos.org/build/65617511
mono48: https://hydra.nixos.org/build/65600645
---
 pkgs/development/compilers/mono/4.4.nix           | 2 +-
 pkgs/development/compilers/mono/4.6.nix           | 1 +
 pkgs/development/compilers/mono/4.8.nix           | 1 +
 pkgs/development/compilers/mono/generic-cmake.nix | 6 +++---
 pkgs/development/compilers/mono/generic.nix       | 6 +++---
 5 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'pkgs/development/compilers')

diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix
index b9cf7d949537..f80cffe220ea 100644
--- a/pkgs/development/compilers/mono/4.4.nix
+++ b/pkgs/development/compilers/mono/4.4.nix
@@ -4,5 +4,5 @@ callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
   version = "4.4.2.11";
   sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h";
-  buildParallel = false; # see #32386 -- parallel building broken on 4.4
+  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737
 })
diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix
index 283c34efb321..7c9918cdd397 100644
--- a/pkgs/development/compilers/mono/4.6.nix
+++ b/pkgs/development/compilers/mono/4.6.nix
@@ -4,4 +4,5 @@ callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
   version = "4.6.2.16";
   sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
+  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511
 })
diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix
index 6d870ae30680..c3ba316cd13b 100644
--- a/pkgs/development/compilers/mono/4.8.nix
+++ b/pkgs/development/compilers/mono/4.8.nix
@@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
   version = "4.8.1.0";
   sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
+  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645
 })
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix
index cdab3787795c..de19e4b633e7 100644
--- a/pkgs/development/compilers/mono/generic-cmake.nix
+++ b/pkgs/development/compilers/mono/generic-cmake.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which }:
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }:
 
 let
   llvm     = callPackage ./llvm.nix { };
@@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
   # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
   dontStrip = true;
 
-  enableParallelBuilding = true;
-
   # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
   # because we control pkg-config
   patches = [ ./pkgconfig-before-gac.patch ];
@@ -82,6 +80,8 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/mcs $out/bin/gmcs
   '';
 
+  inherit enableParallelBuilding;
+
   meta = {
     homepage = http://mono-project.com/;
     description = "Cross platform, open source .NET development framework";
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index f067cc2b8bfd..51e39593fe14 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -4,7 +4,7 @@
 
 , version, sha256
 , withLLVM ? false
-, buildParallel ? true
+, enableParallelBuilding ? true
 }:
 
 let
@@ -47,8 +47,6 @@ stdenv.mkDerivation rec {
   # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
   dontStrip = true;
 
-  enableParallelBuilding = buildParallel;
-
   # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
   # because we control pkg-config
   patches = [ ./pkgconfig-before-gac.patch ];
@@ -85,6 +83,8 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/mcs $out/bin/gmcs
   '';
 
+  inherit enableParallelBuilding;
+
   meta = {
     homepage = http://mono-project.com/;
     description = "Cross platform, open source .NET development framework";
-- 
cgit 1.4.1