diff options
| author | lethalman <lucabru@src.gnome.org> | 2016-01-13 15:47:25 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2016-01-13 15:47:25 +0100 |
| commit | 091c74b1c8bd94c22a51416ce11e441c67d306bf (patch) | |
| tree | 9d60ee587cc853587da0b06c4f7c1b1bf22a7aa8 /pkgs/build-support | |
| parent | b292e19fbddaddd4ada813965e3be3880f15fa7e (diff) | |
| parent | 119a9458fbe45c6a1928eb48396b8045067a90f0 (diff) | |
| download | nixlib-091c74b1c8bd94c22a51416ce11e441c67d306bf.tar nixlib-091c74b1c8bd94c22a51416ce11e441c67d306bf.tar.gz nixlib-091c74b1c8bd94c22a51416ce11e441c67d306bf.tar.bz2 nixlib-091c74b1c8bd94c22a51416ce11e441c67d306bf.tar.lz nixlib-091c74b1c8bd94c22a51416ce11e441c67d306bf.tar.xz nixlib-091c74b1c8bd94c22a51416ce11e441c67d306bf.tar.zst nixlib-091c74b1c8bd94c22a51416ce11e441c67d306bf.zip | |
Merge pull request #12062 from mogorman/platformio
platformio: init at 2.7.0
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 54ce3e768975..5db0d98b79a8 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, bash, ruby } : -{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "" } : +{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } : let name = env.pname; @@ -26,6 +26,7 @@ let ''; in runCommand name { + meta = importMeta; passthru.env = runCommand "${name}-shell-env" { shellHook = '' |