public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mono46, mono48: disable parallel building

Browse Source 
See #32386
mono46: https://hydra.nixos.org/build/65617511
mono48: https://hydra.nixos.org/build/65600645
This commit is contained in:
Orivej Desh 2017-12-09 10:51:50 +00:00
parent 5ce5ef06ab
commit 0a41fc6b7c
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/mono/4.4.nix
View File

@ -4,5 +4,5 @@ callPackage ./generic.nix (rec {
inherit Foundation libobjc; inherit Foundation libobjc;
version = "4.4.2.11"; version = "4.4.2.11";
sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h"; sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h";
buildParallel = false; # see #32386 -- parallel building broken on 4.4 enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737
}) })

1
pkgs/development/compilers/mono/4.6.nix
View File

@ -4,4 +4,5 @@ callPackage ./generic.nix (rec {
inherit Foundation libobjc; inherit Foundation libobjc;
version = "4.6.2.16"; version = "4.6.2.16";
sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9"; sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511
}) })

1
pkgs/development/compilers/mono/4.8.nix
View File

@ -4,4 +4,5 @@ callPackage ./generic-cmake.nix (rec {
inherit Foundation libobjc; inherit Foundation libobjc;
version = "4.8.1.0"; version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645
}) })

6
pkgs/development/compilers/mono/generic-cmake.nix
View File

@ -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 let
llvm = callPackage ./llvm.nix { }; 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 # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true; dontStrip = true;
enableParallelBuilding = true;
# We want pkg-config to take priority over the dlls in the Mono framework and the GAC # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
# because we control pkg-config # because we control pkg-config
patches = [ ./pkgconfig-before-gac.patch ]; patches = [ ./pkgconfig-before-gac.patch ];
@ -82,6 +80,8 @@ stdenv.mkDerivation rec {
ln -s $out/bin/mcs $out/bin/gmcs ln -s $out/bin/mcs $out/bin/gmcs
''; '';
inherit enableParallelBuilding;
meta = { meta = {
homepage = http://mono-project.com/; homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework"; description = "Cross platform, open source .NET development framework";

6
pkgs/development/compilers/mono/generic.nix
View File

@ -4,7 +4,7 @@
, version, sha256 , version, sha256
, withLLVM ? false , withLLVM ? false
, buildParallel ? true , enableParallelBuilding ? true
}: }:
let 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 # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true; dontStrip = true;
enableParallelBuilding = buildParallel;
# We want pkg-config to take priority over the dlls in the Mono framework and the GAC # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
# because we control pkg-config # because we control pkg-config
patches = [ ./pkgconfig-before-gac.patch ]; patches = [ ./pkgconfig-before-gac.patch ];
@ -85,6 +83,8 @@ stdenv.mkDerivation rec {
ln -s $out/bin/mcs $out/bin/gmcs ln -s $out/bin/mcs $out/bin/gmcs
''; '';
inherit enableParallelBuilding;
meta = { meta = {
homepage = http://mono-project.com/; homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework"; description = "Cross platform, open source .NET development framework";