From 7e2dcdc5eeb431df461646c7d01a88fa4d56bcb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Aug 2011 18:57:35 +0000 Subject: [PATCH] pkgs/top-level/all-packages.nix: fixed Darwin build of haskellPackages_ghc704_{,no_}profiling svn path=/nixpkgs/trunk/; revision=28880 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06c94958369e..dbece92618a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2141,13 +2141,15 @@ let haskellPackages_ghc704_no_profiling = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix - ghc6101Binary (x : x.ghc704Prefs) true false + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) true false (haskellDefaultVersionPrioFun false)); haskellPackages_ghc704_profiling = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix - ghc6101Binary (x : x.ghc704Prefs) true true + (if stdenv.isDarwin then ghc704Binary else ghc6101Binary) + (x : x.ghc704Prefs) true true (haskellDefaultVersionPrioFun true)); haskellPackages_ghc704 =