summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/virtualization/podman
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2022-02-21 14:40:43 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2022-03-02 09:16:47 +1000
commit676678f23fdf51a1965eb459a4a7dc9bdb78d259 (patch)
treec44771d7463d5534f687bf5654317f357b6f2089 /pkgs/applications/virtualization/podman
parenta1dfddfdef9af7ab913b102d534077c3478407ba (diff)
podman: add darwin wrapper and wrap gvproxy
Diffstat (limited to 'pkgs/applications/virtualization/podman')
-rw-r--r--pkgs/applications/virtualization/podman/wrapper.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix
index d48153361248..fa3a50bc5357 100644
--- a/pkgs/applications/virtualization/podman/wrapper.nix
+++ b/pkgs/applications/virtualization/podman/wrapper.nix
@@ -3,6 +3,7 @@
, makeWrapper
, symlinkJoin
, lib
+, stdenv
, extraPackages ? []
, podman # Docker compat
, runc # Default container runtime
@@ -15,6 +16,7 @@
, iptables
, iproute2
, catatonit
+, gvproxy
}:
# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
@@ -25,6 +27,7 @@ let
podman = podman-unwrapped;
binPath = lib.makeBinPath ([
+ ] ++ lib.optionals stdenv.isLinux [
runc
crun
conmon
@@ -40,6 +43,8 @@ let
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
paths = [
+ gvproxy
+ ] ++ lib.optionals stdenv.isLinux [
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
podman.rootlessport
];