Merge pull request #113048 from zowoq/local-wrapper

buildah, cri-o: prefer to build wrapper locally
2021-02-13 23:16:56 +01:00 · 2021-02-13 23:16:56 +01:00 · c030238b76
commit c030238b76
parent 83be4f8ea2 81ccf17291
2 changed files with 4 additions and 0 deletions
--- 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 = [
--- 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