From 1b4cdac33ea8335d6593ff47a46305dc78ea53c4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 9 Oct 2021 09:48:28 +1000 Subject: podman: remove darwin wrapper - wrapping gvproxy doesn't work since 3.4 - store paths are written to config files which then break when GCed --- pkgs/applications/virtualization/podman/wrapper.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'pkgs/applications/virtualization/podman') diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 400232d2246dc..c9ec18593dff9 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -2,7 +2,6 @@ , runCommand , makeWrapper , lib -, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -14,15 +13,12 @@ , cni-plugins # not added to path , iptables , iproute2 -, gvproxy -, qemu -, xz }: let podman = podman-unwrapped; - binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath ([ runc crun conmon @@ -31,10 +27,6 @@ let util-linux iptables iproute2 - ] ++ lib.optionals stdenv.isDarwin [ - gvproxy - qemu - xz ] ++ extraPackages); in runCommand podman.name { -- cgit 1.4.1