dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #130445 from zowoq/podman-machine

Browse Source 
podman: add darwin wrapper with qemu for podman machine
This commit is contained in:
Jörg Thalheim 2021-07-17 14:17:07 +01:00 committed by GitHub
commit 3200fa9a6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/virtualization/podman/default.nix
View File

@ -64,11 +64,9 @@ buildGoModule rec {
installShellCompletion --fish completions/fish/* installShellCompletion --fish completions/fish/*
installShellCompletion --zsh completions/zsh/* installShellCompletion --zsh completions/zsh/*
MANDIR=$man/share/man make install.man-nobuild 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 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/tmpfile/podman.conf -t $out/lib/tmpfiles.d
install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
'' + ''
runHook postInstall runHook postInstall
''; '';

8
pkgs/applications/virtualization/podman/wrapper.nix
View File

@ -2,6 +2,7 @@
, runCommand , runCommand
, makeWrapper , makeWrapper
, lib , lib
, stdenv
, extraPackages ? [] , extraPackages ? []
, podman # Docker compat , podman # Docker compat
, runc # Default container runtime , runc # Default container runtime
@ -13,12 +14,14 @@
, cni-plugins # not added to path , cni-plugins # not added to path
, iptables , iptables
, iproute2 , iproute2
, qemu
, xz
}: }:
let let
podman = podman-unwrapped; podman = podman-unwrapped;
binPath = lib.makeBinPath ([ binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [
runc runc
crun crun
conmon conmon
@ -27,6 +30,9 @@ let
util-linux util-linux
iptables iptables
iproute2 iproute2
] ++ lib.optionals stdenv.isDarwin [
qemu
xz
] ++ extraPackages); ] ++ extraPackages);
in runCommand podman.name { in runCommand podman.name {

5
pkgs/top-level/all-packages.nix
View File

@ -8056,10 +8056,7 @@ in
podiff = callPackage ../tools/text/podiff { }; podiff = callPackage ../tools/text/podiff { };
podman = if stdenv.isDarwin then podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
callPackage ../applications/virtualization/podman { }
else
callPackage ../applications/virtualization/podman/wrapper.nix { };
podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-unwrapped = callPackage ../applications/virtualization/podman { };
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};