diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2016-12-21 15:51:18 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2016-12-21 15:51:18 +0100 |
commit | 3373a55cacb8117a53d5ea3b01241177a975fa0b (patch) | |
tree | 25b85be810f94109fa30ccb45face49bf35eb145 /pkgs/development/interpreters/guile | |
parent | a399c55a0f45381e0581597bc87700134d059de6 (diff) | |
parent | 953fe37009f6117738a8c7f40b3cd7e5969eedfd (diff) | |
download | nixpkgs-3373a55cacb8117a53d5ea3b01241177a975fa0b.tar nixpkgs-3373a55cacb8117a53d5ea3b01241177a975fa0b.tar.gz nixpkgs-3373a55cacb8117a53d5ea3b01241177a975fa0b.tar.bz2 nixpkgs-3373a55cacb8117a53d5ea3b01241177a975fa0b.tar.lz nixpkgs-3373a55cacb8117a53d5ea3b01241177a975fa0b.tar.xz nixpkgs-3373a55cacb8117a53d5ea3b01241177a975fa0b.tar.zst nixpkgs-3373a55cacb8117a53d5ea3b01241177a975fa0b.zip |
Merge remote-tracking branch 'origin/master' into gcc-6
Diffstat (limited to 'pkgs/development/interpreters/guile')
-rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 391885a4404..790951ff699 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 @@ -53,7 +53,8 @@ ''; # make check doesn't work on darwin - doCheck = !stdenv.isDarwin; + # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. + doCheck = false; setupHook = ./setup-hook-2.0.sh; |