public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userFHSEnv: add passthru, rename meta

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-03 04:14:19 +03:00
parent 8c6f5ecf8f
commit 375c410d07
2 changed files with 8 additions and 6 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,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}

5
pkgs/top-level/all-packages.nix
View File

@ -134,11 +134,12 @@ in
};
buildFHSUserEnv = args: userFHSEnv {
env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" ]);
env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" "passthru" ]);
runScript = args.runScript or "bash";
extraBindMounts = args.extraBindMounts or [];
extraInstallCommands = args.extraInstallCommands or "";
importMeta = args.meta or {};
meta = args.meta or {};
passthru = args.passthru or {};
};
buildMaven = callPackage ../build-support/build-maven.nix {};