JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

idris: clean up overrides

Browse Source 
Closes https://github.com/NixOS/nixpkgs/pull/18309.
This commit is contained in:
Peter Simons 2016-09-10 22:00:45 +02:00
parent 86557f9ffd
commit 51932e3d69
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -867,9 +867,6 @@ self: super: {
# https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
# Can't find libHSidris-*.so during build.
idris = disableSharedExecutables super.idris;
# https://github.com/fpco/stackage/issues/838
cryptonite = dontCheck super.cryptonite;
@ -987,4 +984,14 @@ self: super: {
# https://bitbucket.org/ssaasen/spy/pull-requests/3/fsnotify-dropped-system-filepath
spy = appendPatch super.spy ./patches/spy.patch;
idris = overrideCabal super.idris (drv: {
# "idris" binary cannot find Idris library otherwise while building. After
# installing it's completely fine though. This seems like a bug in Idris
# that's related to builds with shared libraries enabled. It would be great
# if someone who knows a thing or two about Idris could look into this.
preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
# https://github.com/idris-lang/Idris-dev/issues/2499
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
});
}

9
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -45,15 +45,6 @@ self: super: {
# Build jailbreak-cabal with the latest version of Cabal.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; };
idris = overrideCabal super.idris (drv: {
# "idris" binary cannot find Idris library otherwise while building.
# After installing it's completely fine though. Seems like Nix-specific
# issue so not reported.
preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
# https://github.com/idris-lang/Idris-dev/issues/2499
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
});
Extra = appendPatch super.Extra (pkgs.fetchpatch {
url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";