diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-24 00:02:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 00:02:25 +0000 |
| commit | 6a4e9dff735fc9f2135a04d092c3ca0d346cd56f (patch) | |
| tree | 94b25d930581b74d92f939504886e5ee4d24c9b4 /pkgs/build-support | |
| parent | 01a65d81f31318c45659b5cdf6870d7ffe835baa (diff) | |
| parent | e81467f581f3283171e58bde727a2d8aa10647b8 (diff) | |
| download | nixlib-6a4e9dff735fc9f2135a04d092c3ca0d346cd56f.tar nixlib-6a4e9dff735fc9f2135a04d092c3ca0d346cd56f.tar.gz nixlib-6a4e9dff735fc9f2135a04d092c3ca0d346cd56f.tar.bz2 nixlib-6a4e9dff735fc9f2135a04d092c3ca0d346cd56f.tar.lz nixlib-6a4e9dff735fc9f2135a04d092c3ca0d346cd56f.tar.xz nixlib-6a4e9dff735fc9f2135a04d092c3ca0d346cd56f.tar.zst nixlib-6a4e9dff735fc9f2135a04d092c3ca0d346cd56f.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 7218d67062e7..23e439c6c423 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -915,7 +915,7 @@ rec { mkdir $out ${if enableFakechroot then '' - proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c ' + proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -c ' source $stdenv/setup eval "$fakeRootCommands" tar \ |