From 1d49f0daff8e2422239895eff6e02fb5219544d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Feb 2008 17:25:10 +0000
Subject: [PATCH] * Renamed the darwin stdenv to powerpc-darwin, since
 i686-darwin uses stdenv/nix.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10812
---
 pkgs/stdenv/default.nix                            | 8 ++++----
 pkgs/stdenv/{darwin => powerpc-darwin}/default.nix | 0
 pkgs/stdenv/{darwin => powerpc-darwin}/prehook.sh  | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/stdenv/{darwin => powerpc-darwin}/default.nix (100%)
 rename pkgs/stdenv/{darwin => powerpc-darwin}/prehook.sh (100%)

diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index f5abc8267aaf..f5f47427f659 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -46,7 +46,7 @@ rec {
 
   # The Nix build environment.
   stdenvNix = (import ./nix) (rec {
-    stdenv = if system == "i686-darwin" then stdenvDarwin else stdenvNative; # !!! hack
+    stdenv = if system == "i686-darwin" then stdenvPowerpcDarwin else stdenvNative; # !!! hack
     pkgs = allPackages {
       inherit system;
       bootStdenv = removeAttrs stdenv ["gcc"]; # Hack
@@ -59,9 +59,9 @@ rec {
   stdenvLinux = (import ./linux {inherit system allPackages;}).stdenvLinux;
 
     
-  # Darwin (Mac OS X) standard environment.  Very simple for now
+  # powerpc-darwin (Mac OS X) standard environment.  Very simple for now
   # (essentially it's just the native environment).
-  stdenvDarwin = (import ./darwin) {
+  stdenvPowerpcDarwin = (import ./powerpc-darwin) {
     stdenv = stdenvInitial;
     inherit genericStdenv gccWrapper;
   };
@@ -97,7 +97,7 @@ rec {
     if stdenvType == "i686-freebsd" then stdenvFreeBSD else
     if stdenvType == "i686-cygwin" then stdenvCygwin else
     if stdenvType == "i686-mingw" then stdenvMinGW else
-    if stdenvType == "powerpc-darwin" then stdenvDarwin else
+    if stdenvType == "powerpc-darwin" then stdenvPowerpcDarwin else
     if stdenvType == "i686-darwin" then stdenvNix else
     stdenvNative;
 }
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/powerpc-darwin/default.nix
similarity index 100%
rename from pkgs/stdenv/darwin/default.nix
rename to pkgs/stdenv/powerpc-darwin/default.nix
diff --git a/pkgs/stdenv/darwin/prehook.sh b/pkgs/stdenv/powerpc-darwin/prehook.sh
similarity index 100%
rename from pkgs/stdenv/darwin/prehook.sh
rename to pkgs/stdenv/powerpc-darwin/prehook.sh