diff options
author | Anders Papitto <anderspapitto@gmail.com> | 2015-03-09 23:26:08 -0700 |
---|---|---|
committer | Anders Papitto <anderspapitto@gmail.com> | 2015-03-09 23:44:51 -0700 |
commit | 4bcc817521ede20d76dde97de096f9a5ce5c78f7 (patch) | |
tree | 8993bef65272f40ce71a840a52d6fa69da07c5e9 /pkgs/build-support/build-fhs-userenv/default.nix | |
parent | a869c8351cfcd6ec42147e7f1c8f4f14ac20e587 (diff) | |
download | nixlib-4bcc817521ede20d76dde97de096f9a5ce5c78f7.tar nixlib-4bcc817521ede20d76dde97de096f9a5ce5c78f7.tar.gz nixlib-4bcc817521ede20d76dde97de096f9a5ce5c78f7.tar.bz2 nixlib-4bcc817521ede20d76dde97de096f9a5ce5c78f7.tar.lz nixlib-4bcc817521ede20d76dde97de096f9a5ce5c78f7.tar.xz nixlib-4bcc817521ede20d76dde97de096f9a5ce5c78f7.tar.zst nixlib-4bcc817521ede20d76dde97de096f9a5ce5c78f7.zip |
build-fhs-userenv passes through command line args
The motivation for this change is to allow things like the following derivation, which wraps the debian-packaged hello binary. let nixpkgs = import <nixpkgs> {}; stdenv = nixpkgs.stdenv; in rec { dumb-hello = stdenv.mkDerivation { name = "dumb-hello"; builder = ./builder.sh; dpkg = nixpkgs.dpkg; src = nixpkgs.fetchurl { url = "http://ftp.us.debian.org/debian/pool/main/h/hello-traditional/hello-traditional_2.9-2_amd64.deb"; md5 = "f5f3c28b65221dae44dda6f242c23316"; }; }; full-hello = nixpkgs.buildFHSUserEnv { name = "full-hello"; targetPkgs = pkgs: [ dumb-hello ]; multiPkgs = pkgs: [ pkgs.dpkg ]; runScript = "hello"; }; }
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv/default.nix')
-rw-r--r-- | pkgs/build-support/build-fhs-userenv/default.nix | 4 |
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 ''; |