diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-24 00:53:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-24 01:05:30 -0400 |
| commit | b087618ac06256cb3c06278e7eaba45841f4ea91 (patch) | |
| tree | aeb5d6123fa58ebd20ff0351fba5b285d14c20e6 /pkgs/stdenv/generic/builder.sh | |
| parent | f4a8e6ab7f4e1c6d7499a1660fbd5c655ad0a805 (diff) | |
| download | nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.gz nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.bz2 nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.lz nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.xz nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.tar.zst nixlib-b087618ac06256cb3c06278e7eaba45841f4ea91.zip | |
Revert "stdenv: Store one package per line in nix-support/propagated-*"
As @oxij points out in [1], this breakage is especially serious because it changes the contents of built environments without a corresonding change in their hashes. Also, the revert is easier than I thought. This reverts commit 3cb745d5a69018829ac15f7d5a508135f6bda123. [1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
Diffstat (limited to 'pkgs/stdenv/generic/builder.sh')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index f8c0fd44ac78..a46c46c2db50 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -1,3 +1,4 @@ +export PATH= for i in $initialPath; do if [ "$i" = / ]; then i=; fi PATH=$PATH${PATH:+:}$i/bin @@ -14,6 +15,4 @@ cat "$setup" >> $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. mkdir $out/nix-support -if [ "$propagatedUserEnvPkgs" ]; then - printf '%s\n' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages -fi +echo $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages |