diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-11-16 12:37:22 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-11-17 07:51:53 +1000 |
| commit | 684ffc109ebf4f611cc2b91a37a39541eff4c166 (patch) | |
| tree | 09c4c3006a986344f3148d22c1777800a602af37 /pkgs/applications/virtualization/cri-o | |
| parent | 5d1d22047c98ab15f529ec661852961f61b5b170 (diff) | |
cri-o: refactor wrapper
Diffstat (limited to 'pkgs/applications/virtualization/cri-o')
| -rw-r--r-- | pkgs/applications/virtualization/cri-o/wrapper.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index a984db037d46..b220c8e29cbf 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -3,7 +3,6 @@ , makeWrapper , lib , extraPackages ? [] -, cri-o , runc # Default container runtime , crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor @@ -12,8 +11,6 @@ }: let - cri-o = cri-o-unwrapped; - binPath = lib.makeBinPath ([ runc crun @@ -22,13 +19,13 @@ let iptables ] ++ extraPackages); -in runCommand cri-o.name { - name = "${cri-o.pname}-wrapper-${cri-o.version}"; - inherit (cri-o) pname version passthru; +in runCommand cri-o-unwrapped.name { + name = "${cri-o-unwrapped.pname}-wrapper-${cri-o-unwrapped.version}"; + inherit (cri-o-unwrapped) pname version passthru; preferLocalBuild = true; - meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; + meta = builtins.removeAttrs cri-o-unwrapped.meta [ "outputsToInstall" ]; outputs = [ "out" @@ -40,7 +37,7 @@ in runCommand cri-o.name { ]; } '' - ln -s ${cri-o.man} $man + ln -s ${cri-o-unwrapped.man} $man mkdir -p $out/bin ln -s ${cri-o-unwrapped}/share $out/share |