b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

podman: add darwin wrapper and wrap gvproxy

Browse source
This commit is contained in:
zowoq 2022-02-21 14:40:43 +10:00
parent a1dfddfdef
commit 676678f23f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/virtualization/podman/wrapper.nix
View file

@ -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
];

5
pkgs/top-level/all-packages.nix
View file

@ -8979,10 +8979,7 @@ with pkgs;
podiff = callPackage ../tools/text/podiff { };
podman = if stdenv.isDarwin then
callPackage ../applications/virtualization/podman { }
else
callPackage ../applications/virtualization/podman/wrapper.nix { };
podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
podman-unwrapped = callPackage ../applications/virtualization/podman { };
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};