diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-21 19:49:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-21 19:49:54 +0100 |
| commit | 702768bc287fb4c58d263e1a78319b8e9540bd70 (patch) | |
| tree | 308ba8a0b62f401558000553d42c331864348a6b | |
| parent | 1969d7d85cadbbb39b12260220c602fc61c48e0c (diff) | |
| parent | bb5827a6926dcd576e029459ed8e7e723d963616 (diff) | |
Merge pull request #202174 from mupdt/containers-prefer-local-builds
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/build-support/references-by-popularity/default.nix | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index a3145e504f23e..6b07865928e62 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -547,10 +547,14 @@ rec { pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; architecture = defaultArch; + preferLocalBuild = true; os = "linux"; }); impure = runCommand "${baseName}-config.json" - { nativeBuildInputs = [ jq ]; } + { + nativeBuildInputs = [ jq ]; + preferLocalBuild = true; + } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -925,6 +929,7 @@ rec { { inherit fromImage maxLayers created; imageName = lib.toLower name; + preferLocalBuild = true; passthru.imageTag = if tag != null then tag @@ -1015,6 +1020,7 @@ rec { result = runCommand "stream-${baseName}" { inherit (conf) imageName; + preferLocalBuild = true; passthru = passthru // { inherit (conf) imageTag; diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix index 4cae2dcf3ca96..dfc25275f34c5 100644 --- a/pkgs/build-support/references-by-popularity/default.nix +++ b/pkgs/build-support/references-by-popularity/default.nix @@ -5,6 +5,7 @@ path: runCommand "closure-paths" { exportReferencesGraph.graph = path; __structuredAttrs = true; + preferLocalBuild = true; PATH = "${coreutils}/bin:${python3}/bin"; builder = builtins.toFile "builder" '' |