about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/podman
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2021-05-30 11:14:03 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2021-05-30 11:40:33 +1000
commitfd59022ee9eb8d08b65df563c65e4218a68fca3c (patch)
tree4356f89afe754f2fd00b411ebcd32fdc6a9798dd /pkgs/applications/virtualization/podman
parentada45ac3aee664265759611d09443d549250bd70 (diff)
podman: install cni config
Diffstat (limited to 'pkgs/applications/virtualization/podman')
-rw-r--r--pkgs/applications/virtualization/podman/default.nix1
-rw-r--r--pkgs/applications/virtualization/podman/wrapper.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index f392fd98c43b6..c72a3577bf801 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 ae163583e6997..9f3e1943b56ed 100644
--- a/pkgs/applications/virtualization/podman/wrapper.nix
+++ b/pkgs/applications/virtualization/podman/wrapper.nix
@@ -48,6 +48,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 \