Merge #55420: buildEnv, substituteAll: disable binary cache

... into staging.
This commit is contained in:
Vladimír Čunát 2019-02-22 11:36:27 +01:00
commit 2adf954e84
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
5 changed files with 5 additions and 0 deletions

View File

@ -196,4 +196,5 @@ in stdenv.mkDerivation {
${if isMultiBuild then extraBuildCommandsMulti else ""}
'';
preferLocalBuild = true;
allowSubstitutes = false;
}

View File

@ -70,6 +70,7 @@ runCommand name
priority = drv.meta.priority or 5;
}) paths);
preferLocalBuild = true;
allowSubstitutes = false;
# XXX: The size is somewhat arbitrary
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
}

View File

@ -22,4 +22,5 @@ stdenv.mkDerivation ({
eval "$postInstall"
'';
preferLocalBuild = true;
allowSubstitutes = false;
} // args)

View File

@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({
builder = ./substitute-all.sh;
inherit (args) src;
preferLocalBuild = true;
allowSubstitutes = false;
} // args)

View File

@ -4,6 +4,7 @@ runCommand "fc-cache"
rec {
buildInputs = [ fontconfig.bin ];
preferLocalBuild = true;
allowSubstitutes = false;
passAsFile = [ "fontDirs" ];
fontDirs = ''
<!-- Font directories -->