mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
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
This commit is contained in:
parent
c78b0efdc0
commit
d767c0c253
@ -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 ];
|
||||
});
|
||||
|
@ -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 ] ;
|
||||
|
Loading…
Reference in New Issue
Block a user