tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
haskellPackages.intero: fix tests (thanks @rvl)
obadz
9 years ago
fcb0023e
a357edc0
+7
-3
1 changed file
expand all
collapse all
unified
split
pkgs
development
haskell-modules
configuration-common.nix
+7
-3
pkgs/development/haskell-modules/configuration-common.nix
···
1027
1027
cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
1028
1028
pango = addBuildTool super.pango self.gtk2hs-buildtools;
1029
1029
1030
1030
-
# Tests fail with "Couldn't launch intero process."
1031
1031
-
intero = dontCheck super.intero;
1030
1030
+
# Fix tests which would otherwise fail with "Couldn't launch intero process."
1031
1031
+
intero = overrideCabal super.intero (drv: {
1032
1032
+
postPatch = (drv.postPatch or "") + ''
1033
1033
+
substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\""
1034
1034
+
'';
1035
1035
+
});
1032
1036
1033
1037
# libmpd has an upper-bound on time which doesn't seem to be a real build req
1034
1038
libmpd = dontCheck (overrideCabal super.libmpd (drv: {
1035
1039
postPatch = (drv.postPatch or "") + ''
1036
1036
-
substituteInPlace ./libmpd.cabal --replace "time >=1.5 && <1.6" "time >=1.5"
1040
1040
+
substituteInPlace libmpd.cabal --replace "time >=1.5 && <1.6" "time >=1.5"
1037
1041
'';
1038
1042
}));
1039
1043
}