diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 18:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 18:00:56 +0000 |
| commit | d6b748b2b34de00a07b5620ff4b30c14a7d8078a (patch) | |
| tree | 90b3bf6284d194c5e472c16d8bdbbad2db5504b4 /pkgs/applications/virtualization | |
| parent | 4ee4d805d29afac902a3c631ab13ad08fbe1e84d (diff) | |
| parent | a22cd1991064d383f96a786d915507d237e042a0 (diff) | |
| download | nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.gz nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.bz2 nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.lz nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.xz nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.zst nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 5ab696ed1d5..227439713ed 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -64,11 +64,9 @@ buildGoModule rec { installShellCompletion --fish completions/fish/* 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 - '' + '' runHook postInstall ''; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index c9ec18593df..820e8ad18bc 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -2,6 +2,7 @@ , runCommand , makeWrapper , lib +, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -13,12 +14,14 @@ , cni-plugins # not added to path , iptables , iproute2 +, qemu +, xz }: let podman = podman-unwrapped; - binPath = lib.makeBinPath ([ + binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ runc crun conmon @@ -27,6 +30,9 @@ let util-linux iptables iproute2 + ] ++ lib.optionals stdenv.isDarwin [ + qemu + xz ] ++ extraPackages); in runCommand podman.name { |