diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7000f2b3bf0f..1b02e464c3ba 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; @@ -948,17 +945,6 @@ self: super: { # tinc is a new build driver a la Stack that's not yet available from Hackage. tinc = self.callPackage ../tools/haskell/tinc {}; - # https://github.com/NixOS/nixpkgs/issues/14967 - yi = markBroken super.yi; - yi-fuzzy-open = markBroken super.yi-fuzzy-open; - yi-monokai = markBroken super.yi-monokai; - yi-snippet = markBroken super.yi-snippet; - yi-solarized = markBroken super.yi-solarized; - yi-spolsky = markBroken super.yi-spolsky; - - # gtk2hs-buildtools must have Cabal 1.24 - gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_0_0; }; - # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = (addBuildTool super.pango self.gtk2hs-buildtools).overrideDerivation (drv: { @@ -978,7 +964,6 @@ self: super: { sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; }); - # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. @@ -988,7 +973,8 @@ self: super: { # us when we patch the cabal file (Link options will be recored in the ghc package registry). GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; - # remove if a version > 0.1.0.1 ever gets released + # https://github.com/Philonous/hs-stun/pull/1 + # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { postPatch = (drv.postPatch or "") + '' substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" "" @@ -998,4 +984,19 @@ 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]; + }); + + # https://github.com/MarcWeber/hasktags/issues/32 + hasktags = overrideCabal super.hasktags (drv: { + postInstall = "rm $out/bin/test"; + }); + } |