ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Remove PATH assumption from fhs-userenv."

Browse Source 
This reverts commit 2f26b82411.

This breaks terminfo in Bash for some reason (i.e. TAB and other
special keys).

(cherry picked from commit a5322efd95)
This commit is contained in:
Nikolay Amiantov 2016-03-29 17:06:54 +03:00
parent 12528e547f
commit bf65250cdb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/build-fhs-userenv/default.nix
View File

@ -1,9 +1,8 @@
{ runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } : { runCommand, lib, writeText, writeScriptBin, stdenv, ruby } :
{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } : { env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } :
let let
name = env.pname; name = env.pname;
bash' = "${bash}/bin/bash";
# Sandboxing script # Sandboxing script
chroot-user = writeScriptBin "chroot-user" '' chroot-user = writeScriptBin "chroot-user" ''
@ -33,7 +32,7 @@ in runCommand name {
runCommand "${name}-shell-env" { runCommand "${name}-shell-env" {
shellHook = '' shellHook = ''
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS" export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init bash'} "$(pwd)" exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"
''; '';
} '' } ''
echo >&2 "" echo >&2 ""
@ -46,7 +45,7 @@ in runCommand name {
cat <<EOF >$out/bin/${name} cat <<EOF >$out/bin/${name}
#! ${stdenv.shell} #! ${stdenv.shell}
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS" export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS"
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} ${init runScript} "\$(pwd)" "\$@" exec ${chroot-user}/bin/chroot-user ${env} bash ${init runScript} "\$(pwd)" "\$@"
EOF EOF
chmod +x $out/bin/${name} chmod +x $out/bin/${name}
${extraInstallCommands} ${extraInstallCommands}