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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
This commit is contained in:
Eelco Dolstra
2011-12-12 16:54:35 +00:00
parent 5de58eb387 b0834a993e
commit eda3fd1730
320 changed files with 4058 additions and 2823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/native/default.nix
+8 -4
View File
@@ -1,10 +1,13 @@
{system, allPackages ? import ../../..}:
{ system, allPackages ? import ../../.. }:
rec {
shell = "/bin/bash";
shell =
if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
else "/bin/bash";
path = (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++
path =
(if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++
(if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
["/" "/usr" "/usr/local"];
@@ -87,6 +90,7 @@ rec {
preHook =
if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else
if system == "i686-freebsd" then prehookFreeBSD else
if system == "x86_64-freebsd" then prehookFreeBSD else
if system == "i686-openbsd" then prehookOpenBSD else
if system == "i686-netbsd" then prehookNetBSD else
prehookBase;
@@ -109,7 +113,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;
};