From 7c77e6d988c45b0c637d3ff8443fda8646f7f970 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 5 May 2020 00:28:00 +0100 Subject: [PATCH] podman: Link directly to podman.man instead of maping over outputs This seems brittle and fails on Hydra / OfBorg but not locally. --- .../virtualization/podman/wrapper.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 6a64adc88e6..99233696b3e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -27,30 +27,23 @@ let iptables ] ++ extraPackages); - outputs = [ - "out" - "man" - ]; - in runCommand podman.name { name = "${podman.pname}-wrapper-${podman.version}"; inherit (podman) pname version; meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; - inherit outputs; + outputs = [ + "out" + "man" + ]; nativeBuildInputs = [ makeWrapper ]; } '' - # Symlink everything but $out from podman-unwrapped - ${ - lib.concatMapStringsSep "\n" - (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "out") - outputs)} + ln -s ${podman.man} $man mkdir -p $out/bin ln -s ${podman-unwrapped}/share $out/share