mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 21:21:06 +00:00
Merge pull request #6737 from anderspapitto/fhs
build-fhs-userenv passes through command line args
This commit is contained in:
commit
fcfe8ecc33
|
@ -22,7 +22,7 @@ in stdenv.mkDerivation {
|
|||
mkdir -p $out/bin
|
||||
cat > $out/bin/${name} <<EOF
|
||||
#! ${stdenv.shell}
|
||||
exec ${chroot-user}/bin/chroot-user ${env} $out/libexec/run
|
||||
exec ${chroot-user}/bin/chroot-user ${env} $out/libexec/run "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/${name}
|
||||
|
||||
|
@ -30,7 +30,7 @@ in stdenv.mkDerivation {
|
|||
cat > $out/libexec/run <<EOF
|
||||
#! ${stdenv.shell}
|
||||
source /etc/profile
|
||||
${runScript}
|
||||
${runScript} "\$@"
|
||||
EOF
|
||||
chmod +x $out/libexec/run
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue