diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 5fafc36273a..c2186cf6bfa 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -74,7 +74,7 @@ runCommand name preferLocalBuild = true; allowSubstitutes = false; # XXX: The size is somewhat arbitrary - passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; + passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ]; } '' ${buildPackages.perl}/bin/perl -w ${builder} diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index eab5366e183..8759a67f4ea 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -6,13 +6,14 @@ let stdenv.mkDerivation ({ name = lib.strings.sanitizeDerivationName name; inherit buildCommand; - passAsFile = [ "buildCommand" ]; + passAsFile = [ "buildCommand" ] + ++ (env.passAsFile or []); } // (lib.optionalAttrs runLocal { preferLocalBuild = true; allowSubstitutes = false; }) - // env); + // builtins.removeAttrs env [ "passAsFile" ]); in