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

* Don't require a stdenv to build stdenv. This obviates the need for

Browse Source 
a stdenvInitial in the bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13942
This commit is contained in:
Eelco Dolstra 2009-02-01 21:28:55 +00:00
parent 12038d5586
commit 52122b0e4d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/generic/builder.sh
View File

@ -8,7 +8,11 @@ _postHook="$postHook"
preHook= preHook=
postHook= postHook=
source $stdenv/setup export PATH=
for i in $initialPath; do
if test "$i" = /; then i=; fi
PATH=$PATH${PATH:+:}$i/bin
done
mkdir $out mkdir $out

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

@ -1,4 +1,4 @@
{ stdenv, name, preHook ? null, postHook ? null, initialPath, gcc, shell { system, name, preHook ? null, postHook ? null, initialPath, gcc, shell
, param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? "" , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
, extraAttrs ? {} , extraAttrs ? {}
, fetchurlBoot, forceFetchurlBoot , fetchurlBoot, forceFetchurlBoot
@ -11,10 +11,12 @@ let {
# The stdenv that we are producing. # The stdenv that we are producing.
result = result =
stdenv.mkDerivation { derivation {
inherit name; inherit system name;
builder = ./builder.sh; builder = shell;
args = ["-e" ./builder.sh];
setup = setupScript; setup = setupScript;