podman: remove darwin wrapper
- wrapping gvproxy doesn't work since 3.4 - store paths are written to config files which then break when GCed
This commit is contained in:
parent
b6ba0f59ca
commit
1b4cdac33e
2 changed files with 5 additions and 10 deletions
|
@ -2,7 +2,6 @@
|
|||
, runCommand
|
||||
, makeWrapper
|
||||
, lib
|
||||
, stdenv
|
||||
, extraPackages ? []
|
||||
, podman # Docker compat
|
||||
, runc # Default container runtime
|
||||
|
@ -14,15 +13,12 @@
|
|||
, cni-plugins # not added to path
|
||||
, iptables
|
||||
, iproute2
|
||||
, gvproxy
|
||||
, qemu
|
||||
, xz
|
||||
}:
|
||||
|
||||
let
|
||||
podman = podman-unwrapped;
|
||||
|
||||
binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [
|
||||
binPath = lib.makeBinPath ([
|
||||
runc
|
||||
crun
|
||||
conmon
|
||||
|
@ -31,10 +27,6 @@ let
|
|||
util-linux
|
||||
iptables
|
||||
iproute2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
gvproxy
|
||||
qemu
|
||||
xz
|
||||
] ++ extraPackages);
|
||||
|
||||
in runCommand podman.name {
|
||||
|
|
|
@ -8451,7 +8451,10 @@ with pkgs;
|
|||
|
||||
podiff = callPackage ../tools/text/podiff { };
|
||||
|
||||
podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
|
||||
podman = if stdenv.isDarwin then
|
||||
callPackage ../applications/virtualization/podman { }
|
||||
else
|
||||
callPackage ../applications/virtualization/podman/wrapper.nix { };
|
||||
podman-unwrapped = callPackage ../applications/virtualization/podman { };
|
||||
|
||||
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};
|
||||
|
|
Loading…
Reference in a new issue