diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
commit | cd71f7a2e660440cbcf634ba97eaae310084d11a (patch) | |
tree | a40196e3795a4f18ff8fcc9d0f93af0fc1afa3cb /pkgs/top-level/haskell-defaults.nix | |
parent | c1cf0b7dd5fccb16c8c470d8c766a050fd7a4a36 (diff) | |
parent | 25b395bc8d8b1590723dc42edd97561611f8db68 (diff) | |
download | nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.gz nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.bz2 nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.lz nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.xz nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.zst nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.zip |
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts: pkgs/development/interpreters/ruby/ruby-19.nix pkgs/development/libraries/libc++/default.nix pkgs/development/libraries/libc++abi/default.nix pkgs/tools/text/sgml/opensp/default.nix
Diffstat (limited to 'pkgs/top-level/haskell-defaults.nix')
-rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 4fcab8e9d6d..5a516238a1b 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -205,6 +205,8 @@ gmp = pkgs.gmp4; }); + ghc783Binary = lowPrio (callPackage ../development/compilers/ghc/7.8.3-binary.nix {}); + ghc6101BinaryDarwin = if stdenv.isDarwin then ghc704Binary else ghc6101Binary; ghc6121BinaryDarwin = if stdenv.isDarwin then ghc704Binary else ghc6121Binary; @@ -225,7 +227,7 @@ packages_ghc783 = packages { ghcPath = ../development/compilers/ghc/7.8.3.nix; - ghcBinary = ghc742Binary; + ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; prefFun = ghc783Prefs; }; |