diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 11:36:27 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 13:57:01 +0100 |
| commit | 2adf954e846cc4f6e654c6814a7605cfe53bc003 (patch) | |
| tree | 7fa4ca8db08b3f03b5667928c6817000b7f3b785 /pkgs/build-support | |
| parent | 4c212f6b122c6a0ab7f81f3e568f160a3d6a784b (diff) | |
| parent | c706233f2e722aba83b7379b173341dd2afa27ce (diff) | |
| download | nixlib-2adf954e846cc4f6e654c6814a7605cfe53bc003.tar nixlib-2adf954e846cc4f6e654c6814a7605cfe53bc003.tar.gz nixlib-2adf954e846cc4f6e654c6814a7605cfe53bc003.tar.bz2 nixlib-2adf954e846cc4f6e654c6814a7605cfe53bc003.tar.lz nixlib-2adf954e846cc4f6e654c6814a7605cfe53bc003.tar.xz nixlib-2adf954e846cc4f6e654c6814a7605cfe53bc003.tar.zst nixlib-2adf954e846cc4f6e654c6814a7605cfe53bc003.zip | |
Merge #55420: buildEnv, substituteAll: disable binary cache
... into staging.
Diffstat (limited to 'pkgs/build-support')
4 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 23568f51b23e..c0f741b62886 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -196,4 +196,5 @@ in stdenv.mkDerivation { ${if isMultiBuild then extraBuildCommandsMulti else ""} ''; preferLocalBuild = true; + allowSubstitutes = false; } diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index f858048d6947..7f2427777f92 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -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; } diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index aa600a76650c..66feb695c418 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -22,4 +22,5 @@ stdenv.mkDerivation ({ eval "$postInstall" ''; preferLocalBuild = true; + allowSubstitutes = false; } // args) diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 7fd46f95f998..57b160bbe901 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({ builder = ./substitute-all.sh; inherit (args) src; preferLocalBuild = true; + allowSubstitutes = false; } // args) |