summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-09-10 22:00:45 +0200
committerPeter Simons <simons@cryp.to>2016-09-10 22:01:15 +0200
commit51932e3d6962d4525cdc4f13e400d0c1b74a520e (patch)
treecea3e752dc7787981f46201513e1660066922957 /pkgs/development/haskell-modules/configuration-common.nix
parent86557f9ffd6600bbac0cbccae02af6e9e0be207c (diff)
downloadnixlib-51932e3d6962d4525cdc4f13e400d0c1b74a520e.tar
nixlib-51932e3d6962d4525cdc4f13e400d0c1b74a520e.tar.gz
nixlib-51932e3d6962d4525cdc4f13e400d0c1b74a520e.tar.bz2
nixlib-51932e3d6962d4525cdc4f13e400d0c1b74a520e.tar.lz
nixlib-51932e3d6962d4525cdc4f13e400d0c1b74a520e.tar.xz
nixlib-51932e3d6962d4525cdc4f13e400d0c1b74a520e.tar.zst
nixlib-51932e3d6962d4525cdc4f13e400d0c1b74a520e.zip
idris: clean up overrides
Closes https://github.com/NixOS/nixpkgs/pull/18309.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e3609c9d0bc6..4a41836a5cf9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -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];
+  });
+
 }