From 369f20924a4291be25145247f893de03d919b520 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 14 Feb 2021 07:58:19 +1000 Subject: [PATCH 1/2] cri-o: prefer to build wrapper locally Same as 9c9828260989fa4f3d1211a48f1db1e4d65dbf18 --- pkgs/applications/virtualization/cri-o/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index 5aca291a6018..a0a39beeda20 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -27,6 +27,8 @@ in runCommand cri-o.name { name = "${cri-o.pname}-wrapper-${cri-o.version}"; inherit (cri-o) pname version passthru; + preferLocalBuild = true; + meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; outputs = [ From 81ccf17291acb0659f372aaac21a267acc1db92b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 14 Feb 2021 07:58:19 +1000 Subject: [PATCH 2/2] buildah: prefer to build wrapper locally Same as 9c9828260989fa4f3d1211a48f1db1e4d65dbf18 --- pkgs/development/tools/buildah/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index dfa465cfdea7..a31dece7df5e 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -17,6 +17,8 @@ let buildah = buildah-unwrapped; + preferLocalBuild = true; + binPath = lib.makeBinPath ([ runc crun