mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
ghcjs: don't propagate Cabal to all packages
Previously, we were compiling Setup.hs with ghcjs (instead of ghc), and that required that Cabal be available, otherwise the Setup.hs would fail to compile. Now that we are compiling Setup.hs with ghc, it's no longer necessary to add Cabal as a dependency to all ghcjs packages.
This commit is contained in:
parent
97d9071b95
commit
e6e9970891
|
@ -21,13 +21,6 @@ self: super:
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
mkDerivation = drv: super.mkDerivation (drv // {
|
|
||||||
# Need Cabal lib to be available.
|
|
||||||
libraryHaskellDepends = drv.libraryHaskellDepends
|
|
||||||
# Be careful not to end up in infinite recursion!
|
|
||||||
++ pkgs.lib.optional (!(builtins.elem drv.pname ["Cabal" "hscolour"])) self.Cabal;
|
|
||||||
});
|
|
||||||
|
|
||||||
# LLVM is not supported on this GHC; use the latest one.
|
# LLVM is not supported on this GHC; use the latest one.
|
||||||
inherit (pkgs) llvmPackages;
|
inherit (pkgs) llvmPackages;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue