Unverified Commit 9e5a44bc authored by nicoo's avatar nicoo Committed by GitHub
Browse files

nixos/podman: set `preferLocalBuild` on trivial `runCommand`s (#340980)

parent ff0345d9

nixos/modules/virtualisation/podman/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ let 
    {

      outputs = [ "out" "man" ];

      inherit (podmanPackage) meta;

      preferLocalBuild = true;

    } ''

    mkdir -p $out/bin

    ln -s ${podmanPackage}/bin/podman $out/bin/docker
@@ -235,7 +236,10 @@ in 
      systemd.tmpfiles.packages = [

        # The /run/podman rule interferes with our podman group, so we remove

        # it and let the systemd socket logic take care of it.

        (pkgs.runCommand "podman-tmpfiles-nixos" { package = cfg.package; } ''

        (pkgs.runCommand "podman-tmpfiles-nixos" {

          package = cfg.package;

          preferLocalBuild = true;

        } ''

          mkdir -p $out/lib/tmpfiles.d/

          grep -v 'D! /run/podman 0700 root root' \

            <$package/lib/tmpfiles.d/podman.conf \