treewide: use systemdLibs for virtualization and container tools

This commit is contained in:
Raito Bezarius
2026-10-03 15:26:46 +02:00
parent c0a79d5b64
commit 276a90dfaf
6 changed files with 14 additions and 14 deletions

View File

@@ -52,8 +52,8 @@ let
nixosTests,
clientOnly ? !stdenv.hostPlatform.isLinux,
symlinkJoin,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
systemd,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
systemdLibs,
withBtrfs ? stdenv.hostPlatform.isLinux,
btrfs-progs,
withLvm ? stdenv.hostPlatform.isLinux,
@@ -188,7 +188,7 @@ let
++ lib.optionals (lib.versionAtLeast version "29.0.0") [ nftables ]
++ lib.optionals withLvm [ lvm2 ]
++ lib.optionals withBtrfs [ btrfs-progs ]
++ lib.optionals withSystemd [ systemd ]
++ lib.optionals withSystemd [ systemdLibs ]
++ lib.optionals withSeccomp [ libseccomp ];
postPatch = ''

View File

@@ -12,7 +12,7 @@
libseccomp,
libselinux,
# TODO: investigate why changing from `systemd` to `systemdMinimal` breaks `podman logs`
systemd,
systemdLibs,
nixosTests,
python3,
makeBinaryWrapper,
@@ -82,7 +82,7 @@ buildGoModule (finalAttrs: {
libapparmor
libseccomp
libselinux
systemd
systemdLibs
];
env = {
@@ -134,7 +134,7 @@ buildGoModule (finalAttrs: {
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped)
patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped
patchelf --set-rpath "${lib.makeLibraryPath [ systemdLibs ]}":$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}'

View File

@@ -22,7 +22,7 @@
cmake,
libcap,
glib,
systemd,
systemdLibs,
json-glib,
libarchive,
libsolv,
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
ostree
rpm
glib
systemd
systemdLibs
polkit
bubblewrap
json-glib

View File

@@ -14,7 +14,7 @@
libxfixes,
dbus,
libdrm,
systemd,
systemdLibs,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "spice-vdagent";
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
libxinerama
libxfixes
dbus
systemd
systemdLibs
];
# fix build w/ glibc-2.44

View File

@@ -22,7 +22,7 @@
librsvg,
libvpx,
libwebp,
systemd,
systemdLibs,
lz4,
nv-codec-headers-10,
nvidia_x11 ? null,
@@ -185,7 +185,7 @@ effectiveBuildPythonApplication rec {
openh264
libyuv
xxhash
systemd
systemdLibs
]
++ lib.optionals withNvenc [
nvencHeaders

View File

@@ -7,7 +7,7 @@
getconf,
dbus,
libseccomp,
systemd,
systemdLibs,
stdenv,
}:
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [
dbus
libseccomp
systemd
systemdLibs
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''