Unverified Commit 3c4d5031 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

podman: replace `systemdMinimal` with `systemd` (#471084)

parents 3c61a8ad 317a105e

pkgs/by-name/po/podman/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
  libapparmor,

  libseccomp,

  libselinux,

  systemdMinimal,

  # TODO: investigate why changing from `systemd` to `systemdMinimal` breaks `podman logs`

  systemd,

  nixosTests,

  python3,

  makeBinaryWrapper,
@@ -83,7 +84,7 @@ buildGoModule (finalAttrs: { 
    libseccomp

    libselinux

    lvm2

    systemdMinimal

    systemd

  ];



  env = {
@@ -135,7 +136,7 @@ buildGoModule (finalAttrs: { 


  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''

    RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped)

    patchelf --set-rpath "${lib.makeLibraryPath [ systemdMinimal ]}":$RPATH $out/bin/.podman-wrapped

    patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped

    substituteInPlace "$out/share/systemd/user/podman-user-wait-network-online.service" \

      --replace-fail sleep '${coreutils}/bin/sleep' \

      --replace-fail /bin/sh '${runtimeShell}'