diff options
author | obadz <obadz-git@obadz.com> | 2016-06-09 08:51:40 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-06-09 08:53:47 +0100 |
commit | fcb0023e8030074f140c69013a6b339880cd24de (patch) | |
tree | cc7639518618ae3a80a1d2f2d2a50fe149042009 /pkgs | |
parent | a357edc0c69f24f3d82a79f736e55ffe8991bdce (diff) | |
download | nixlib-fcb0023e8030074f140c69013a6b339880cd24de.tar nixlib-fcb0023e8030074f140c69013a6b339880cd24de.tar.gz nixlib-fcb0023e8030074f140c69013a6b339880cd24de.tar.bz2 nixlib-fcb0023e8030074f140c69013a6b339880cd24de.tar.lz nixlib-fcb0023e8030074f140c69013a6b339880cd24de.tar.xz nixlib-fcb0023e8030074f140c69013a6b339880cd24de.tar.zst nixlib-fcb0023e8030074f140c69013a6b339880cd24de.zip |
haskellPackages.intero: fix tests (thanks @rvl)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b5ccb3d8f3a0..3d9606298dc5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1027,13 +1027,17 @@ self: super: { cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = addBuildTool super.pango self.gtk2hs-buildtools; - # Tests fail with "Couldn't launch intero process." - intero = dontCheck super.intero; + # Fix tests which would otherwise fail with "Couldn't launch intero process." + intero = overrideCabal super.intero (drv: { + postPatch = (drv.postPatch or "") + '' + substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\"" + ''; + }); # libmpd has an upper-bound on time which doesn't seem to be a real build req libmpd = dontCheck (overrideCabal super.libmpd (drv: { postPatch = (drv.postPatch or "") + '' - substituteInPlace ./libmpd.cabal --replace "time >=1.5 && <1.6" "time >=1.5" + substituteInPlace libmpd.cabal --replace "time >=1.5 && <1.6" "time >=1.5" ''; })); } |