diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-11-30 22:45:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 22:45:33 -0500 |
| commit | eeb15153b9a0e8e34bac54fc4c76e367c3cc98f7 (patch) | |
| tree | c9564c8c8bd4258f8bc2858e8fc265bc8c7611b8 /pkgs/development/interpreters/guile | |
| parent | e945c7032dd24c5f7bac48af073019fa421a048e (diff) | |
| parent | f1fd88f7f43c89bb3136c6c1978ed3f614868109 (diff) | |
Merge pull request #20830 from grahamc/guile
guile: apply patch fixing 00-repl-server.test stability (WIP)
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 05ef07961210..b0b4e26fffb8 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, coverageAnalysis ? null, gnu ? null }: +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: # Do either a coverage analysis build or a standard build. (if coverageAnalysis != null @@ -31,7 +31,13 @@ # libguile/vm-i-system.i is not created in time enableParallelBuilding = false; - patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch ] ++ + patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch + (fetchpatch { + # Fixes stability issues with 00-repl-server.test + url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; + sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; + }) + ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); # Explicitly link against libgcc_s, to work around the infamous |