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

Merge #55420: buildEnv, substituteAll: disable binary cache

Browse Source 
... 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/build-support/build-fhs-userenv/env.nix
View File

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

1
pkgs/build-support/buildenv/default.nix
View File

@ -70,6 +70,7 @@ runCommand name
priority = drv.meta.priority or 5; priority = drv.meta.priority or 5;
}) paths); }) paths);
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false;
# XXX: The size is somewhat arbitrary # 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 null;
} }

1
pkgs/build-support/substitute-files/substitute-all-files.nix
View File

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

1
pkgs/build-support/substitute/substitute-all.nix
View File

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

1
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
View File

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