ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Added Solaris support to the stdenv

Browse Source 
svn path=/nixpkgs/trunk/; revision=17559
This commit is contained in:
Sander van der Burg 2009-09-30 15:19:25 +00:00
parent de014f5bb3
commit 068b2158f5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/stdenv/generic/default.nix
View File

@ -75,7 +75,8 @@ let
isi686 = result.system == "i686-linux" isi686 = result.system == "i686-linux"
|| result.system == "i686-darwin" || result.system == "i686-darwin"
|| result.system == "i686-freebsd" || result.system == "i686-freebsd"
|| result.system == "i686-openbsd"; || result.system == "i686-openbsd"
|| result.system == "i386-sunos";
is64bit = result.system == "x86_64-linux"; is64bit = result.system == "x86_64-linux";
# Utility function: allow stdenv to be easily regenerated with # Utility function: allow stdenv to be easily regenerated with

6
pkgs/stdenv/native/default.nix
View File

@ -4,8 +4,8 @@ rec {
shell = "/bin/bash"; 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" '' prehookBase = builtins.toFile "prehook-base.sh" ''
# Disable purity tests; it's allowed (even needed) to link to # Disable purity tests; it's allowed (even needed) to link to
@ -91,7 +91,7 @@ rec {
name = "gcc-native"; name = "gcc-native";
nativeTools = true; nativeTools = true;
nativeLibc = true; nativeLibc = true;
nativePrefix = "/usr"; nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr";
stdenv = stdenvBoot0; stdenv = stdenvBoot0;
}; };