From b087618ac06256cb3c06278e7eaba45841f4ea91 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 24 Jul 2017 00:53:13 -0400 Subject: 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 --- pkgs/stdenv/generic/builder.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/stdenv/generic/builder.sh') 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 -- cgit 1.4.1