diff options
| -rw-r--r-- | nixos/modules/virtualisation/podman.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 1dc79272ccb6..e3ae7296766a 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -8,13 +8,11 @@ let # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { - outputs = [ "out" "bin" "man" ]; + outputs = [ "out" "man" ]; inherit (podmanPackage) meta; } '' - mkdir $out - - mkdir -p $bin/bin - ln -s ${podmanPackage.bin}/bin/podman $bin/bin/docker + mkdir -p $out/bin + ln -s ${podmanPackage}/bin/podman $out/bin/docker mkdir -p $man/share/man/man1 for f in ${podmanPackage.man}/share/man/man1/*; do diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 0b905c0c709e..551f134478ba 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -34,15 +34,15 @@ in runCommand podman.name { ]; } '' - # Symlink everything but $bin from podman-unwrapped + # Symlink everything but $out from podman-unwrapped ${ lib.concatMapStringsSep "\n" (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "bin") + (builtins.filter (o: o != "out") podman.outputs)} - mkdir -p $bin/bin - ln -s ${podman-unwrapped}/share $bin/share - makeWrapper ${podman-unwrapped}/bin/podman $bin/bin/podman \ + mkdir -p $out/bin + ln -s ${podman-unwrapped}/share $out/share + makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ --prefix PATH : ${binPath} '' |