Unverified Commit 6ccf14ba authored by Terje Larsen's avatar Terje Larsen
Browse files

dockerTools.streamLayeredImage: fix enableFakechroot 

This broke with #417132 where the previous behaviour of suppressing
errors of the export into $NIX_BUILD_TOP/env-vars when dumping env vars.

This error seems to stem from the non-existance of $NIX_BUILD_TOP. This
fix ensures the NIX_BUILD_TOP propagates into the proot environment.
parent 6dccd456

pkgs/build-support/docker/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,7 @@ rec { 
          "/proc/"

          "/sys/"

          "${builtins.storeDir}/"

          "$NIX_BUILD_TOP"

          "$out/layer.tar"

        ]

      );
@@ -1085,6 +1086,7 @@ rec { 
                    --exclude=./proc \

                    --exclude=./sys \

                    --exclude=.${builtins.storeDir} \

                    --exclude=".$NIX_BUILD_TOP" \

                    --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \

                    --hard-dereference \

                    -cf $out/layer.tar .