diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-07-12 03:37:33 +0200 |
---|---|---|
committer | Silvan Mosberger <infinisil@icloud.com> | 2018-07-13 00:59:30 +0200 |
commit | d767c0c253bf118ca7291c469da33a7e5d2d767e (patch) | |
tree | 7866caea0b0b0bd530cca8e618236f7f8c34f0f3 /pkgs | |
parent | c78b0efdc095da61bd7ae1ef8e4f13d518b737f8 (diff) | |
download | nixpkgs-d767c0c253bf118ca7291c469da33a7e5d2d767e.tar nixpkgs-d767c0c253bf118ca7291c469da33a7e5d2d767e.tar.gz nixpkgs-d767c0c253bf118ca7291c469da33a7e5d2d767e.tar.bz2 nixpkgs-d767c0c253bf118ca7291c469da33a7e5d2d767e.tar.lz nixpkgs-d767c0c253bf118ca7291c469da33a7e5d2d767e.tar.xz nixpkgs-d767c0c253bf118ca7291c469da33a7e5d2d767e.tar.zst nixpkgs-d767c0c253bf118ca7291c469da33a7e5d2d767e.zip |
idris: Remove unneeded overrides
- The gmp issue has long been fixed and closed - The preBuild thing was never used afaik, it works no problem without it, especially since checks don't run (To get checks to work we'd have to compile the libraries into idris, which are currently nicely separated) - The dependencies overrides aren't needed anymore
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
2 files changed, 1 insertions, 24 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2e3a8e1c867..86494e9323b 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 9c3109df6d0..42648d0813a 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 ] ; |