diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-07-16 13:08:20 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-07-17 20:54:50 +1000 |
commit | f4902536aa58ef95857a2c55fb650105bb87b442 (patch) | |
tree | c0bd26eeefa7f2442fbe17a0deac2982a7a50db6 /pkgs/applications/virtualization/podman | |
parent | d41882c7b984520b80956a55987a30badae17050 (diff) |
podman: add darwin wrapper with qemu for podman machine
- requires xz to unpack vm image
- remove linux install conditional to simplify wrapper
Diffstat (limited to 'pkgs/applications/virtualization/podman')
-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 5ab696ed1d57..227439713ed3 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 c9ec18593dff..820e8ad18bcc 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 { |