varcila/jungle
1
0
Fork 0
forked from rarias/jungle
Code Pull Requests Activity

Remove nix-portable tmpbin feature

Browse Source 
It will not work without the host /lib64/ld

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
This commit is contained in:
Aleix Boné
2026-03-06 12:44:54 +01:00
parent a71b12c60e
commit 1d02f7fae4
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/nix-portable/default.nix
View File

@@ -179,10 +179,6 @@ let
store="\$dir/nix/store" store="\$dir/nix/store"
# create /nix/var/nix to prevent nix from falling back to chroot store. # create /nix/var/nix to prevent nix from falling back to chroot store.
mkdir -p \$dir/{bin,nix/var/nix,nix/store} mkdir -p \$dir/{bin,nix/var/nix,nix/store}
# sanitize the tmpbin directory
rm -rf "\$dir/tmpbin"
# create a directory to hold executable symlinks for overriding
mkdir -p "\$dir/tmpbin"
# create minimal drv file for nix to spawn a nix shell # create minimal drv file for nix to spawn a nix shell
echo 'builtins.derivation {name="foo"; builder="/bin/sh"; args = ["-c" "echo hello \> \\\$out"]; system=builtins.currentSystem;}' > "\$dir/mini-drv.nix" echo 'builtins.derivation {name="foo"; builder="/bin/sh"; args = ["-c" "echo hello \> \\\$out"]; system=builtins.currentSystem;}' > "\$dir/mini-drv.nix"
@@ -575,11 +571,6 @@ let
### set PATH ### set PATH
# restore original PATH and append busybox # restore original PATH and append busybox
export PATH="\$PATH_OLD:\$dir/busybox/bin" export PATH="\$PATH_OLD:\$dir/busybox/bin"
# apply overriding executable paths in \$dir/tmpbin/
export PATH="\$dir/tmpbin:\$PATH"
### install programs via nix ### install programs via nix
${concatMapStringsSep "\n" installDynamic bootstrapPrograms} ${concatMapStringsSep "\n" installDynamic bootstrapPrograms}