diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index deb0b4d2c5bd7..a9311667bb05a 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -5,12 +5,16 @@ let inherit (lib) mkOption types; - podmanPackage = (pkgs.podman.override { + podmanPackage = pkgs.podman.override { extraPackages = cfg.extraPackages # setuid shadow ++ [ "/run/wrappers" ] ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package; - }); + extraRuntimes = [ pkgs.runc ] + ++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [ + slirp4netns + ]); + }; # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 1d5cb70e58861..21df0c8a3dad2 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -23,7 +23,6 @@ , runc , conmon , extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki -, slirp4netns , fuse-overlayfs , util-linux , iptables @@ -56,7 +55,6 @@ let aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark - slirp4netns passt conmon crun