Author: ludo
Date: Wed Apr 25 14:25:34 2012
New Revision: 33920
URL: https://nixos.org/websvn/nix/?rev=33920&sc=1

Log:
nixUnstable: Use Apple-GCC on Darwin.

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Apr 25 14:21:41 
2012        (r33919)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Apr 25 14:25:34 
2012        (r33920)
@@ -8512,6 +8512,11 @@
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
     stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
+    stdenv =
+      if stdenv.isDarwin
+      # When building the Perl bindings, `-no-cpp-precomp' is used.
+      then overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   nixSqlite = nixUnstable;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to