about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-01-24 00:02:51 +0000
committerGitHub <noreply@github.com>2024-01-24 00:02:51 +0000
commit9bf128cad3576ca83f711d304f0b6c62dd477e3e (patch)
treee4c596ff833fa33175fdd288c769213f27114f6d /pkgs/build-support
parent9dfb5091e1e414e329e8c0455c150d4a82b8bf34 (diff)
parent6a4e9dff735fc9f2135a04d092c3ca0d346cd56f (diff)
downloadnixlib-9bf128cad3576ca83f711d304f0b6c62dd477e3e.tar
nixlib-9bf128cad3576ca83f711d304f0b6c62dd477e3e.tar.gz
nixlib-9bf128cad3576ca83f711d304f0b6c62dd477e3e.tar.bz2
nixlib-9bf128cad3576ca83f711d304f0b6c62dd477e3e.tar.lz
nixlib-9bf128cad3576ca83f711d304f0b6c62dd477e3e.tar.xz
nixlib-9bf128cad3576ca83f711d304f0b6c62dd477e3e.tar.zst
nixlib-9bf128cad3576ca83f711d304f0b6c62dd477e3e.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/docker/default.nix2
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 \