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

build-fhs-userenv: added the option meta to be passed down to the final derivation.

Browse Source
This commit is contained in:
Matthew O'Gorman 2016-01-06 03:50:49 -05:00
parent a413b8fde1
commit c87ef76027
No known key found for this signature in database
GPG Key ID: F71F32386DEAE4B2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/build-fhs-userenv/default.nix
View File

@ -1,5 +1,5 @@
{ runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } : { runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } :
{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "" } : { env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } :
let let
name = env.pname; name = env.pname;
@ -26,6 +26,7 @@ let
''; '';
in runCommand name { in runCommand name {
meta = importMeta;
passthru.env = passthru.env =
runCommand "${name}-shell-env" { runCommand "${name}-shell-env" {
shellHook = '' shellHook = ''

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

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