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