about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2015-03-10 17:53:32 +0100
committerlethalman <lucabru@src.gnome.org>2015-03-10 17:53:32 +0100
commitfcfe8ecc33c4e4b122f141470831e7b98954d4a5 (patch)
tree94f037f858d1aeeae394d32c23279d4016fe326e /pkgs/build-support
parentfc15721871776672488c8b2e85424e4ddcf56cd4 (diff)
parent4bcc817521ede20d76dde97de096f9a5ce5c78f7 (diff)
downloadnixlib-fcfe8ecc33c4e4b122f141470831e7b98954d4a5.tar
nixlib-fcfe8ecc33c4e4b122f141470831e7b98954d4a5.tar.gz
nixlib-fcfe8ecc33c4e4b122f141470831e7b98954d4a5.tar.bz2
nixlib-fcfe8ecc33c4e4b122f141470831e7b98954d4a5.tar.lz
nixlib-fcfe8ecc33c4e4b122f141470831e7b98954d4a5.tar.xz
nixlib-fcfe8ecc33c4e4b122f141470831e7b98954d4a5.tar.zst
nixlib-fcfe8ecc33c4e4b122f141470831e7b98954d4a5.zip
Merge pull request #6737 from anderspapitto/fhs
build-fhs-userenv passes through command line args
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/build-fhs-userenv/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 57864b4934bb..67484857ee16 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -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
   '';