diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-05-05 00:28:00 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-05-05 00:47:42 +0100 |
| commit | 7c77e6d988c45b0c637d3ff8443fda8646f7f970 (patch) | |
| tree | 3792612e57061ac3f7da6c62974ce36cfae98b19 /pkgs/applications/virtualization/podman | |
| parent | b346e1d4440570079ae75eaccd6125ab55ec8152 (diff) | |
| download | nixlib-7c77e6d988c45b0c637d3ff8443fda8646f7f970.tar nixlib-7c77e6d988c45b0c637d3ff8443fda8646f7f970.tar.gz nixlib-7c77e6d988c45b0c637d3ff8443fda8646f7f970.tar.bz2 nixlib-7c77e6d988c45b0c637d3ff8443fda8646f7f970.tar.lz nixlib-7c77e6d988c45b0c637d3ff8443fda8646f7f970.tar.xz nixlib-7c77e6d988c45b0c637d3ff8443fda8646f7f970.tar.zst nixlib-7c77e6d988c45b0c637d3ff8443fda8646f7f970.zip | |
podman: Link directly to podman.man instead of maping over outputs
This seems brittle and fails on Hydra / OfBorg but not locally.
Diffstat (limited to 'pkgs/applications/virtualization/podman')
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 6a64adc88e6b..99233696b3ed 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 |