diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-24 11:34:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-24 11:34:57 +0100 |
commit | ffe34944ec3a22c270c9b20a787e87ea1b90641a (patch) | |
tree | 27ff57c4dcea30988df9e1da4f59f074b6023487 /pkgs/development/guile-modules | |
parent | 50946a790e7b3290074eb39aa2d47b6359592342 (diff) | |
parent | 913e770fa819fe8a9395bac30c8c796b944bc2fe (diff) | |
download | nixpkgs-ffe34944ec3a22c270c9b20a787e87ea1b90641a.tar nixpkgs-ffe34944ec3a22c270c9b20a787e87ea1b90641a.tar.gz nixpkgs-ffe34944ec3a22c270c9b20a787e87ea1b90641a.tar.bz2 nixpkgs-ffe34944ec3a22c270c9b20a787e87ea1b90641a.tar.lz nixpkgs-ffe34944ec3a22c270c9b20a787e87ea1b90641a.tar.xz nixpkgs-ffe34944ec3a22c270c9b20a787e87ea1b90641a.tar.zst nixpkgs-ffe34944ec3a22c270c9b20a787e87ea1b90641a.zip |
Merge pull request #29725 from rvl/guile-lib
guile-lib: Disable a test which doesn't work with Guile 2.2
Diffstat (limited to 'pkgs/development/guile-modules')
-rw-r--r-- | pkgs/development/guile-modules/guile-lib/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index de456b4983a..62482cec7e6 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, guile, texinfo}: +{stdenv, fetchurl, guile, texinfo, pkgconfig}: assert stdenv ? cc && stdenv.cc.isGNU; @@ -10,8 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b"; }; + nativeBuildInputs = [pkgconfig]; buildInputs = [guile texinfo]; + # One test doesn't seem to be compatible with guile_2_2 + patchPhase = '' + sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile* + ''; + doCheck = true; preCheck = |