* Don't require a stdenv to build stdenv. This obviates the need for
a stdenvInitial in the bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=13942
This commit is contained in:
parent
12038d5586
commit
52122b0e4d
|
@ -8,7 +8,11 @@ _postHook="$postHook"
|
|||
preHook=
|
||||
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
|
||||
|
||||
|
|
|
@ -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 ? ""
|
||||
, extraAttrs ? {}
|
||||
, fetchurlBoot, forceFetchurlBoot
|
||||
|
@ -11,10 +11,12 @@ let {
|
|||
# The stdenv that we are producing.
|
||||
result =
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
derivation {
|
||||
inherit system name;
|
||||
|
||||
builder = ./builder.sh;
|
||||
builder = shell;
|
||||
|
||||
args = ["-e" ./builder.sh];
|
||||
|
||||
setup = setupScript;
|
||||
|
||||
|
|
Loading…
Reference in a new issue