diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
| commit | 52404a868ddc6665da66f54dab5f102908843784 (patch) | |
| tree | da856ff0f583e67a7a209d8d75826f796df5a3bb /pkgs/development/interpreters/guile | |
| parent | c0e2aceef46033e43ab8b4f6aa0b36b25ba35f3d (diff) | |
| parent | 8e02bde1a8ea913ecaa4801898057968412efa01 (diff) | |
| download | nixlib-52404a868ddc6665da66f54dab5f102908843784.tar nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.gz nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.bz2 nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.lz nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.xz nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.zst nixlib-52404a868ddc6665da66f54dab5f102908843784.zip | |
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index ad5d2f1cc587..c4634de5d3f2 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -27,7 +27,9 @@ # A native Guile 2.0 is needed to cross-build Guile. selfNativeBuildInput = true; - enableParallelBuilding = true; + # Guile 2.0.11 repeatable fails with 8-core parallel building because + # libguile/vm-i-system.i is not created in time + enableParallelBuilding = false; patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); |