diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2016-02-18 15:00:34 -0500 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2016-02-18 15:00:34 -0500 |
commit | e6e9970891781768d85a1c3005c2486b591723c7 (patch) | |
tree | 49e81992278ecfe8588ce992a7c88d9709392101 /pkgs/development/haskell-modules/configuration-ghcjs.nix | |
parent | 97d9071b95e25eb2d9840b0f24639e2fb8eab5e0 (diff) | |
download | nixpkgs-e6e9970891781768d85a1c3005c2486b591723c7.tar nixpkgs-e6e9970891781768d85a1c3005c2486b591723c7.tar.gz nixpkgs-e6e9970891781768d85a1c3005c2486b591723c7.tar.bz2 nixpkgs-e6e9970891781768d85a1c3005c2486b591723c7.tar.lz nixpkgs-e6e9970891781768d85a1c3005c2486b591723c7.tar.xz nixpkgs-e6e9970891781768d85a1c3005c2486b591723c7.tar.zst nixpkgs-e6e9970891781768d85a1c3005c2486b591723c7.zip |
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.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghcjs.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index dfdad72cd3d..53da845210e 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -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. inherit (pkgs) llvmPackages; |