From ba798d2c8976ca1b22fa03c62c6bbb91b38b4924 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 5 May 2020 00:28:00 +0100 Subject: [PATCH 1/2] podman: Link directly to podman.man instead of maping over outputs This seems brittle and fails on Hydra / OfBorg but not locally. --- pkgs/applications/virtualization/podman/wrapper.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 3b9b76c03ee..99233696b3e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -43,12 +43,7 @@ in runCommand podman.name { ]; } '' - # Symlink everything but $out from podman-unwrapped - ${ - lib.concatMapStringsSep "\n" - (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "out") - podman.outputs)} + ln -s ${podman.man} $man mkdir -p $out/bin ln -s ${podman-unwrapped}/share $out/share From 5012fc268b27cd6cddecfc530edcc12fc60fc874 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 6 May 2020 22:26:19 +1000 Subject: [PATCH 2/2] podman: disable on darwin --- pkgs/applications/virtualization/podman/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index feed5cadce3..4a9fa078752 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -54,5 +54,6 @@ buildGoPackage rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; + broken = stdenv.isDarwin; }; }