diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-21 14:11:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-21 14:11:04 +0000 |
| commit | 5abed12234b39120cb0e509114838fb56d7ff41f (patch) | |
| tree | 30c51c58f0940d7f2257dc7e6098d37d2c8d8bfc /pkgs/stdenv | |
| parent | cf4a0bdce9783de271cc668a4c13cd09a7af6afc (diff) | |
* i386-sunos -> i686-solaris.
svn path=/nixpkgs/trunk/; revision=30507
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c4d6a3666d0d4..436b912d8d6f5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -98,7 +98,8 @@ let || result.system == "powerpc-linux" || result.system == "armv5tel-linux" || result.system == "mips64-linux"; - isSunOS = result.system == "i386-sunos"; + isSunOS = result.system == "i686-solaris" + || result.system == "x86_64-solaris"; isCygwin = result.system == "i686-cygwin"; isFreeBSD = result.system == "i686-freebsd" || result.system == "x86_64-freebsd"; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 88b3c17b582b5..9d3b60d67a570 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -3,12 +3,12 @@ rec { shell = - if system == "i686-freebsd" || system == "x86_64-freebsd" - then "/usr/local/bin/bash" + if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" + else if system == "i686-solaris" then "/usr/bin/bash" else "/bin/bash"; path = - (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++ + (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++ (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ ["/" "/usr" "/usr/local"]; @@ -115,7 +115,7 @@ rec { name = "gcc-native"; nativeTools = true; nativeLibc = true; - nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr"; + nativePrefix = if system == "i686-solaris" then "/usr/gnu" else "/usr"; stdenv = stdenvBoot0; }; |