diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:02:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 00:02:06 +0000 |
| commit | 08a8809bfe1688df8419f41fd31c2f794c4debdf (patch) | |
| tree | 02c532b4ebeac226362c3723c8b9cfa1ef7e4c5c /pkgs/stdenv/generic/builder.sh | |
| parent | 11332e9137fbbab82b10312da9dad67e3607f553 (diff) | |
| parent | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (diff) | |
| download | nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.gz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.bz2 nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.lz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.xz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.zst nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv/generic/builder.sh')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 986d94943c5..79bf21ab473 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -4,20 +4,18 @@ for i in $initialPath; do PATH=$PATH${PATH:+:}$i/bin done -mkdir "$out" +mkdir $out -{ - echo "export SHELL=$shell" - echo "initialPath=\"$initialPath\"" - echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" - echo "defaultBuildInputs=\"$defaultBuildInputs\"" - echo "$preHook" - cat "$setup" -} > "$out/setup" +echo "export SHELL=$shell" > $out/setup +echo "initialPath=\"$initialPath\"" >> $out/setup +echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup +echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup +echo "$preHook" >> $out/setup +cat "$setup" >> $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. mkdir $out/nix-support -if [ -n "${propagatedUserEnvPkgs:-}" ]; then +if [ "$propagatedUserEnvPkgs" ]; then printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages fi |