pyrox.dev / nixpkgs
lol
fork atom

podman: remove darwin wrapper

- wrapping gvproxy doesn't work since 3.4
- store paths are written to config files which then break when GCed

zowoq 1b4cdac3 b6ba0f59

+5 -10
unified split
+1 -9
pkgs/applications/virtualization/podman/wrapper.nix
··· 2 2 , runCommand 3 3 , makeWrapper 4 4 , lib 5 - , stdenv 6 5 , extraPackages ? [] 7 6 , podman # Docker compat 8 7 , runc # Default container runtime ··· 14 13 , cni-plugins # not added to path 15 14 , iptables 16 15 , iproute2 17 - , gvproxy 18 - , qemu 19 - , xz 20 16 }: 21 17 22 18 let 23 19 podman = podman-unwrapped; 24 20 25 - binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ 21 + binPath = lib.makeBinPath ([ 26 22 runc 27 23 crun 28 24 conmon ··· 31 27 util-linux 32 28 iptables 33 29 iproute2 34 - ] ++ lib.optionals stdenv.isDarwin [ 35 - gvproxy 36 - qemu 37 - xz 38 30 ] ++ extraPackages); 39 31 40 32 in runCommand podman.name {
+4 -1
pkgs/top-level/all-packages.nix
··· 8451 8451 8452 8452 podiff = callPackage ../tools/text/podiff { }; 8453 8453 8454 - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; 8454 + podman = if stdenv.isDarwin then 8455 + callPackage ../applications/virtualization/podman { } 8456 + else 8457 + callPackage ../applications/virtualization/podman/wrapper.nix { }; 8455 8458 podman-unwrapped = callPackage ../applications/virtualization/podman { }; 8456 8459 8457 8460 podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};