diff options
| author | LluĆs Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-26 21:46:08 +0000 |
|---|---|---|
| committer | LluĆs Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-26 21:46:08 +0000 |
| commit | a3403e6828ee7cac9955b7ad7e420e087b62c700 (patch) | |
| tree | 5fd4a5b069d5af2ac7d93f4c8994cbd57c952725 /pkgs/stdenv/default.nix | |
| parent | 3cda62f6e1b9fe934798ab27daaa0d5da7e9130c (diff) | |
| parent | fe10a3aed5911f4858d667d611c94bb77a375b75 (diff) | |
Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index ed8f0e39f5f..40acb8cfece 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -58,5 +58,6 @@ rec { if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else if stdenvType == "i686-mingw" then stdenvMinGW else if stdenvType == "i686-darwin" then stdenvNix else + if stdenvType == "x86_64-darwin" then stdenvNix else stdenvNative; } |