podman: drop slirp4netns which has been replaced by passt (#313670)

2024-09-09 09:53:33 +08:00
parent 59c3aa2d4d 56e8106538
commit 03e62e5bc3
2 changed files with 6 additions and 4 deletions
--- 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}"