summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2021-05-30 11:15:02 +1000
committerRobert Hensing <robert@roberthensing.nl>2021-06-02 10:20:10 +0200
commitf63aff597b99ebf9c132dc01a712b0c54376ca5d (patch)
tree48516e2feb219e68ed97f1675e4932723e8515ed
parentpodman: install cni config (diff)
downloadnixpkgs-f63aff597b99ebf9c132dc01a712b0c54376ca5d.tar.gz
nixos/podman: install cni config from package
(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
-rw-r--r--nixos/modules/virtualisation/podman.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix
index d6421d488b8b..d485f993fb31 100644
--- a/nixos/modules/virtualisation/podman.nix
+++ b/nixos/modules/virtualisation/podman.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, utils, ... }:
+{ config, lib, pkgs, ... }:
let
cfg = config.virtualisation.podman;
toml = pkgs.formats.toml { };
@@ -92,7 +92,7 @@ in
environment.systemPackages = [ cfg.package ]
++ lib.optional cfg.dockerCompat dockerCompat;
- environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";
+ environment.etc."cni/net.d/87-podman-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/87-podman-bridge.conflist";
virtualisation.containers = {
enable = true; # Enable common /etc/containers configuration