diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-03 04:14:19 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-03 04:19:58 +0300 |
| commit | 375c410d071bd5773519ef8d6283191b07bb98b1 (patch) | |
| tree | f20e9e04ab8a940c1761a00f47427e865e8b1b34 /pkgs/build-support/build-fhs-userenv | |
| parent | 8c6f5ecf8f650af76034bf516392428449814b4d (diff) | |
| download | nixpkgs-375c410d071bd5773519ef8d6283191b07bb98b1.tar nixpkgs-375c410d071bd5773519ef8d6283191b07bb98b1.tar.gz nixpkgs-375c410d071bd5773519ef8d6283191b07bb98b1.tar.bz2 nixpkgs-375c410d071bd5773519ef8d6283191b07bb98b1.tar.lz nixpkgs-375c410d071bd5773519ef8d6283191b07bb98b1.tar.xz nixpkgs-375c410d071bd5773519ef8d6283191b07bb98b1.tar.zst nixpkgs-375c410d071bd5773519ef8d6283191b07bb98b1.zip | |
userFHSEnv: add passthru, rename meta
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index a7e1bd11977..a38f0a4f623 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,5 +1,5 @@ { runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : -{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } : +{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", meta ? {}, passthru ? {} } : let name = env.pname; @@ -27,9 +27,9 @@ let ''; in runCommand name { - meta = importMeta; - passthru.env = - runCommand "${name}-shell-env" { + inherit meta; + passthru = passthru // { + env = runCommand "${name}-shell-env" { shellHook = '' export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS" exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)" @@ -40,6 +40,7 @@ in runCommand name { echo >&2 "" exit 1 ''; + }; } '' mkdir -p $out/bin cat <<EOF >$out/bin/${name} |