diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-05-30 11:14:03 +1000 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-06-02 10:20:10 +0200 |
| commit | 17ba99dd686395191c4876049145c7801ccb4bb8 (patch) | |
| tree | 8bcad09525786fe5fe85633a736ba7e023ca4746 | |
| parent | podman: add systemd to rpath (diff) | |
| download | nixpkgs-17ba99dd686395191c4876049145c7801ccb4bb8.tar.gz | |
podman: install cni config
(cherry picked from commit fd59022ee9eb8d08b65df563c65e4218a68fca3c)
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f392fd98c43b..c72a3577bf80 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 ae163583e699..9f3e1943b56e 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 \ |