pyrox.dev
Revert "Remove PATH assumption from fhs-userenv."
This reverts commit 2f26b82411ea93349d375ea3b5d833b04a455972.
This breaks terminfo in Bash for some reason (i.e. TAB and other
special keys).
+4
-5
pkgs/build-support/build-fhs-userenv/default.nix
+4
-5
pkgs/build-support/build-fhs-userenv/default.nix
···
1
-
{ runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } :
2
-
{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } :
1
+
{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } :
2
+
{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } :
3
3
4
4
let
5
5
name = env.pname;
6
-
bash' = "${bash}/bin/bash";
7
6
8
7
# Sandboxing script
9
8
chroot-user = writeScriptBin "chroot-user" ''
···
33
32
runCommand "${name}-shell-env" {
34
33
shellHook = ''
35
34
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"
36
-
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init bash'} "$(pwd)"
35
+
exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"
37
36
'';
38
37
} ''
39
38
echo >&2 ""
···
46
45
cat <<EOF >$out/bin/${name}
47
46
#! ${stdenv.shell}
48
47
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS"
49
-
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} ${init runScript} "\$(pwd)" "\$@"
48
+
exec ${chroot-user}/bin/chroot-user ${env} bash ${init runScript} "\$(pwd)" "\$@"
50
49
EOF
51
50
chmod +x $out/bin/${name}
52
51
${extraInstallCommands}