alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #86830 from adisbladis/podman-wrapper-outputs

Browse source 
podman: Don't symlink the $bin output
This commit is contained in:
adisbladis 2020-05-05 02:41:42 +02:00 committed by GitHub
parent be3387abef 7c77e6d988
commit 18e8718ffd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/virtualisation/podman.nix
View file

@ -8,13 +8,11 @@ let
# Provides a fake "docker" binary mapping to podman # Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" {
outputs = [ "out" "bin" "man" ]; outputs = [ "out" "man" ];
inherit (podmanPackage) meta; inherit (podmanPackage) meta;
} '' } ''
mkdir $out mkdir -p $out/bin
ln -s ${podmanPackage}/bin/podman $out/bin/docker
mkdir -p $bin/bin
ln -s ${podmanPackage.bin}/bin/podman $bin/bin/docker
mkdir -p $man/share/man/man1 mkdir -p $man/share/man/man1
for f in ${podmanPackage.man}/share/man/man1/*; do for f in ${podmanPackage.man}/share/man/man1/*; do

24
pkgs/applications/virtualization/podman/wrapper.nix
View file

@ -28,21 +28,25 @@ let
] ++ extraPackages); ] ++ extraPackages);
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" ];
outputs = [
"out"
"man"
];
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
]; ];
} '' } ''
# Symlink everything but $bin from podman-unwrapped ln -s ${podman.man} $man
${
lib.concatMapStringsSep "\n"
(o: "ln -s ${podman.${o}} ${placeholder o}")
(builtins.filter (o: o != "bin")
podman.outputs)}
mkdir -p $bin/bin mkdir -p $out/bin
ln -s ${podman-unwrapped}/share $bin/share ln -s ${podman-unwrapped}/share $out/share
makeWrapper ${podman-unwrapped}/bin/podman $bin/bin/podman \ makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \
--prefix PATH : ${binPath} --prefix PATH : ${binPath}
'' ''