public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* i386-sunos -> i686-solaris.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30507
This commit is contained in:
Eelco Dolstra
2011-11-21 14:11:04 +00:00
parent cf4a0bdce9
commit 5abed12234
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/default.nix
+2 -1
View File
@@ -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";
pkgs/stdenv/native/default.nix
+4 -4
View File
@@ -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;
};