diff options
| author | Peter Simons <simons@cryp.to> | 2018-07-16 20:38:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 20:38:53 +0200 |
| commit | 9a32dafd05e5acb8c0c5cfa81a6be0958e06623c (patch) | |
| tree | 9c349bf649e6b9c853f371d41047794fa02b6224 /pkgs/development/haskell-modules | |
| parent | 8b0fea2154bd28b6e6421047f7cd2fc383ce7af4 (diff) | |
| parent | 1d94e4c363776e696f3c46be875b52c36ec9e996 (diff) | |
| download | nixlib-9a32dafd05e5acb8c0c5cfa81a6be0958e06623c.tar nixlib-9a32dafd05e5acb8c0c5cfa81a6be0958e06623c.tar.gz nixlib-9a32dafd05e5acb8c0c5cfa81a6be0958e06623c.tar.bz2 nixlib-9a32dafd05e5acb8c0c5cfa81a6be0958e06623c.tar.lz nixlib-9a32dafd05e5acb8c0c5cfa81a6be0958e06623c.tar.xz nixlib-9a32dafd05e5acb8c0c5cfa81a6be0958e06623c.tar.zst nixlib-9a32dafd05e5acb8c0c5cfa81a6be0958e06623c.zip | |
Merge pull request #43444 from Infinisil/idris-cleanup
idris: Recurse into attrs, fix build and remove unneeded overrides
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2e3a8e1c867d..86494e9323b4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -421,16 +421,6 @@ self: super: builtins.intersectAttrs super { # so disable this on Darwin only ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; - idris = overrideCabal super.idris (drv: { - # https://github.com/idris-lang/Idris-dev/issues/2499 - librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; - - # tests and build run executable, so need to set LD_LIBRARY_PATH - preBuild = '' - export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH" - ''; - }); - libsystemd-journal = overrideCabal super.libsystemd-journal (old: { librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; }); |