From d394c82cde39f3acd4be0a0d22fe379e6c656e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 14 Feb 2020 19:16:49 +0100 Subject: [PATCH] build-fhs-userenv: runCommand -> runCommandLocal (#77253) It's a trivial derivation, no need to build remotely (it's slower that way). --- pkgs/build-support/build-fhs-userenv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 707b256cd4b..e7db6a75297 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, writeScript, stdenv, coreutils }: +{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in @@ -23,10 +23,11 @@ let exec ${run} "$@" ''; -in runCommand name { +in runCommandLocal name { inherit meta; + passthru = passthru // { - env = runCommand "${name}-shell-env" { + env = runCommandLocal "${name}-shell-env" { shellHook = '' exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)" '';