colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

podman: Link directly to podman.man instead of maping over outputs

Browse Source 
This seems brittle and fails on Hydra / OfBorg but not locally.
This commit is contained in:
adisbladis 2020-05-05 00:28:00 +01:00
parent b346e1d444
commit 7c77e6d988
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/virtualization/podman/wrapper.nix
View File

@ -27,30 +27,23 @@ let
iptables iptables
] ++ extraPackages); ] ++ extraPackages);
outputs = [
"out"
"man"
];
in runCommand podman.name { in runCommand podman.name {
name = "${podman.pname}-wrapper-${podman.version}"; name = "${podman.pname}-wrapper-${podman.version}";
inherit (podman) pname version; inherit (podman) pname version;
meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ];
inherit outputs; outputs = [
"out"
"man"
];
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
]; ];
} '' } ''
# Symlink everything but $out from podman-unwrapped ln -s ${podman.man} $man
${
lib.concatMapStringsSep "\n"
(o: "ln -s ${podman.${o}} ${placeholder o}")
(builtins.filter (o: o != "out")
outputs)}
mkdir -p $out/bin mkdir -p $out/bin
ln -s ${podman-unwrapped}/share $out/share ln -s ${podman-unwrapped}/share $out/share