about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2009-11-27 10:56:07 +0000
committerRob Vermaas <rob.vermaas@gmail.com>2009-11-27 10:56:07 +0000
commit746c502acc7ef0e7dee2375ae9dfed323ba28dc6 (patch)
tree9aa4dfb90d4ebb4554d5ebd256b4ddd19683420a /pkgs/top-level/all-packages.nix
parentd8800474f775a4ecaf61f13890b42ef007fd574f (diff)
changes for x86_64-darwin support
svn path=/nixpkgs/trunk/; revision=18667
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4464718b13b2..64404f1d7d91d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1761,10 +1761,11 @@ let
     profiledCompiler = true;
   }));
 
-  gccApple = wrapGCC (import ../development/compilers/gcc-apple {
-    inherit fetchurl stdenv noSysDirs;
-    profiledCompiler = true;
-  });
+  gccApple = 
+    wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) {
+      inherit fetchurl stdenv noSysDirs;
+      profiledCompiler = true;
+    }) ;
 
   gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
     inherit fetchurl stdenv bison autoconf gnum4 noSysDirs;