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

podman: Don't symlink the $bin output

Browse Source 
If we do it propagates and ends up in $PATH inside nix-shell
This commit is contained in:
adisbladis 2020-05-04 20:58:31 +01:00
parent a677738a23
commit b346e1d444
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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