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

build-fhs-userenv: runCommand -> runCommandLocal (#77253) 

It's a trivial derivation, no need to build remotely (it's slower that
way).
This commit is contained in:
Bjørn Forsman 2020-02-14 19:16:49 +01:00 committed by GitHub
parent d54a58a2cd
commit d394c82cde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ callPackage, runCommand, writeScript, stdenv, coreutils }: { callPackage, runCommandLocal, writeScript, stdenv, coreutils }:
let buildFHSEnv = callPackage ./env.nix { }; in let buildFHSEnv = callPackage ./env.nix { }; in
@ -23,10 +23,11 @@ let
exec ${run} "$@" exec ${run} "$@"
''; '';
in runCommand name { in runCommandLocal name {
inherit meta; inherit meta;
passthru = passthru // { passthru = passthru // {
env = runCommand "${name}-shell-env" { env = runCommandLocal "${name}-shell-env" {
shellHook = '' shellHook = ''
exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)" exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)"
''; '';