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 ]; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c3109df6d06..42648d0813a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6633,20 +6633,7 @@ with pkgs; icedtea_web = icedtea8_web; idrisPackages = callPackage ../development/idris-modules { - - idris-no-deps = - let - inherit (self.haskell) lib; - haskellPackages = self.haskellPackages.override { - overrides = self: super: { - binary = lib.dontCheck self.binary_0_8_5_1; - parsers = lib.dontCheck super.parsers; - semigroupoids = lib.dontCheck super.semigroupoids; - trifecta = lib.dontCheck super.trifecta; - }; - }; - in - haskellPackages.idris; + idris-no-deps = haskellPackages.idris; }; idris = idrisPackages.with-packages [ idrisPackages.base ] ;