lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

stdenv: fix propagatedUserEnvPkgs when __structuredAttrs is true

This is a follow-up of #388908.

Previously, $out/nix-support/propagated-user-env-packages was not
created when __structuredAttrs is true, the first element of
propagatedUserEnvPkgs is null and the length of propagatedUserEnvPkgs
is at least 2.

Fixes #388829

+2 -2
+1 -1
pkgs/stdenv/generic/builder.sh
··· 18 18 # Allow the user to install stdenv using nix-env and get the packages 19 19 # in stdenv. 20 20 mkdir $out/nix-support 21 - if [ "$propagatedUserEnvPkgs" ]; then 21 + if [ "${propagatedUserEnvPkgs[*]}" ]; then 22 22 printf '%s ' "${propagatedUserEnvPkgs[@]}" > $out/nix-support/propagated-user-env-packages 23 23 fi
+1 -1
pkgs/stdenv/generic/setup.sh
··· 1642 1642 1643 1643 # Propagate user-env packages into the output with binaries, TODO? 1644 1644 1645 - if [ -n "${propagatedUserEnvPkgs:-}" ]; then 1645 + if [ -n "${propagatedUserEnvPkgs[*]:-}" ]; then 1646 1646 mkdir -p "${!outputBin}/nix-support" 1647 1647 printWords "${propagatedUserEnvPkgs[@]}" > "${!outputBin}/nix-support/propagated-user-env-packages" 1648 1648 fi