diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-05-31 14:27:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 14:27:10 +0200 |
| commit | 3600a82711987ac1267a96fd97974437b69f6806 (patch) | |
| tree | b2f7af4e9439076e52666decf415956e86576fdc | |
| parent | ec1d8d52a390dd4bf42ca074e954461468d7fec2 (diff) | |
| parent | 30ae7e4ba983de461c7b71d02274d184ab55244d (diff) | |
| download | nixpkgs-3600a82711987ac1267a96fd97974437b69f6806.tar nixpkgs-3600a82711987ac1267a96fd97974437b69f6806.tar.gz nixpkgs-3600a82711987ac1267a96fd97974437b69f6806.tar.bz2 nixpkgs-3600a82711987ac1267a96fd97974437b69f6806.tar.lz nixpkgs-3600a82711987ac1267a96fd97974437b69f6806.tar.xz nixpkgs-3600a82711987ac1267a96fd97974437b69f6806.tar.zst nixpkgs-3600a82711987ac1267a96fd97974437b69f6806.zip | |
Merge pull request #124921 from zowoq/podman-cni-conf
podman: install cni config
| -rw-r--r-- | nixos/modules/virtualisation/podman.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 01ff84bc629..b16afb66894 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 { }; @@ -107,7 +107,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 diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f2b560bf866..6c518ab8934 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -69,6 +69,7 @@ buildGoModule rec { installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild '' + lib.optionalString stdenv.isLinux '' + install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system '' + '' diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d141ba49a92..c9ec18593df 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -50,6 +50,7 @@ in runCommand podman.name { ln -s ${podman.man} $man mkdir -p $out/bin + ln -s ${podman-unwrapped}/etc $out/etc ln -s ${podman-unwrapped}/lib $out/lib ln -s ${podman-unwrapped}/share $out/share makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ |