diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-10-09 09:48:28 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-10-12 09:37:13 +1000 |
| commit | 1b4cdac33ea8335d6593ff47a46305dc78ea53c4 (patch) | |
| tree | 8bf108a5f9d6467209069b0ca04c42be00f02811 /pkgs/applications/virtualization/podman | |
| parent | b6ba0f59ca8ce1f809613e22b39a26dc0ea3b406 (diff) | |
| download | nixpkgs-1b4cdac33ea8335d6593ff47a46305dc78ea53c4.tar nixpkgs-1b4cdac33ea8335d6593ff47a46305dc78ea53c4.tar.gz nixpkgs-1b4cdac33ea8335d6593ff47a46305dc78ea53c4.tar.bz2 nixpkgs-1b4cdac33ea8335d6593ff47a46305dc78ea53c4.tar.lz nixpkgs-1b4cdac33ea8335d6593ff47a46305dc78ea53c4.tar.xz nixpkgs-1b4cdac33ea8335d6593ff47a46305dc78ea53c4.tar.zst nixpkgs-1b4cdac33ea8335d6593ff47a46305dc78ea53c4.zip | |
podman: remove darwin wrapper
- wrapping gvproxy doesn't work since 3.4 - store paths are written to config files which then break when GCed
Diffstat (limited to 'pkgs/applications/virtualization/podman')
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 400232d2246..c9ec18593df 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 { |