diff options
| author | Peter Simons <simons@cryp.to> | 2015-09-15 12:43:14 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-09-15 16:23:46 +0200 |
| commit | 974f2122b1163de0315c51fc161cdb97b66d6111 (patch) | |
| tree | db661da4d225aa12a285919a41613b1d56f4bd3b /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 73d79ed9457f2bc3d52bad25b5c235e29734c031 (diff) | |
| download | nixpkgs-974f2122b1163de0315c51fc161cdb97b66d6111.tar nixpkgs-974f2122b1163de0315c51fc161cdb97b66d6111.tar.gz nixpkgs-974f2122b1163de0315c51fc161cdb97b66d6111.tar.bz2 nixpkgs-974f2122b1163de0315c51fc161cdb97b66d6111.tar.lz nixpkgs-974f2122b1163de0315c51fc161cdb97b66d6111.tar.xz nixpkgs-974f2122b1163de0315c51fc161cdb97b66d6111.tar.zst nixpkgs-974f2122b1163de0315c51fc161cdb97b66d6111.zip | |
jailbreak-cabal: clean up overrides
These changes ensure that jailbreak-cabal works correctly without further configuration even with older compilers. The exception to that rule being, naturally, versions of GHC that can't compile Cabal 1.20.x; these *do* need another override.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ee8089f9063..80cf5ebd478 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -12,7 +12,7 @@ self: super: { cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); # Link statically to avoid runtime dependency on GHC. - jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; + jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; # Apply NixOS-specific patches. ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch; |