Added Solaris support to the stdenv
svn path=/nixpkgs/trunk/; revision=17559
This commit is contained in:
parent
de014f5bb3
commit
068b2158f5
|
@ -75,7 +75,8 @@ let
|
|||
isi686 = result.system == "i686-linux"
|
||||
|| result.system == "i686-darwin"
|
||||
|| result.system == "i686-freebsd"
|
||||
|| result.system == "i686-openbsd";
|
||||
|| result.system == "i686-openbsd"
|
||||
|| result.system == "i386-sunos";
|
||||
is64bit = result.system == "x86_64-linux";
|
||||
|
||||
# Utility function: allow stdenv to be easily regenerated with
|
||||
|
|
|
@ -4,8 +4,8 @@ rec {
|
|||
|
||||
shell = "/bin/bash";
|
||||
|
||||
path = ["/" "/usr" "/usr/local"];
|
||||
|
||||
path = (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++
|
||||
["/" "/usr" "/usr/local"];
|
||||
|
||||
prehookBase = builtins.toFile "prehook-base.sh" ''
|
||||
# Disable purity tests; it's allowed (even needed) to link to
|
||||
|
@ -91,7 +91,7 @@ rec {
|
|||
name = "gcc-native";
|
||||
nativeTools = true;
|
||||
nativeLibc = true;
|
||||
nativePrefix = "/usr";
|
||||
nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr";
|
||||
stdenv = stdenvBoot0;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue