pyrox.dev / nixpkgs
lol
fork atom

podman: add darwin wrapper and wrap gvproxy

zowoq 676678f2 a1dfddfd

+6 -4
unified split
+5
pkgs/applications/virtualization/podman/wrapper.nix
··· 3 3 , makeWrapper 4 4 , symlinkJoin 5 5 , lib 6 + , stdenv 6 7 , extraPackages ? [] 7 8 , podman # Docker compat 8 9 , runc # Default container runtime ··· 15 16 , iptables 16 17 , iproute2 17 18 , catatonit 19 + , gvproxy 18 20 }: 19 21 20 22 # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed ··· 25 27 podman = podman-unwrapped; 26 28 27 29 binPath = lib.makeBinPath ([ 30 + ] ++ lib.optionals stdenv.isLinux [ 28 31 runc 29 32 crun 30 33 conmon ··· 40 43 41 44 # this only works for some binaries, others may need to be be added to `binPath` or in the modules 42 45 paths = [ 46 + gvproxy 47 + ] ++ lib.optionals stdenv.isLinux [ 43 48 catatonit # added here for the pause image and also set in `containersConf` for `init_path` 44 49 podman.rootlessport 45 50 ];
+1 -4
pkgs/top-level/all-packages.nix
··· 8979 8979 8980 8980 podiff = callPackage ../tools/text/podiff { }; 8981 8981 8982 - podman = if stdenv.isDarwin then 8983 - callPackage ../applications/virtualization/podman { } 8984 - else 8985 - callPackage ../applications/virtualization/podman/wrapper.nix { }; 8982 + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; 8986 8983 podman-unwrapped = callPackage ../applications/virtualization/podman { }; 8987 8984 8988 8985 podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};