diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c7ff2b5ee8cf..d1f179168c75 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -5,6 +5,7 @@ , nixosTests , pkgsCross , fetchFromGitHub +, fetchpatch , fetchzip , buildPackages , makeBinaryWrapper @@ -224,6 +225,15 @@ stdenv.mkDerivation (finalAttrs: { ./0017-meson.build-do-not-create-systemdstatedir.patch ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch + ] ++ lib.optional (stdenv.hostPlatform.isPower || stdenv.hostPlatform.isRiscV) [ + # Fixed upstream and included in the main and stable branches. Can be dropped + # when bumping to >= v255.5. + # https://github.com/systemd/systemd/issues/30448 + # https://github.com/NixOS/nixpkgs/pull/282607 + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/8040fa55a1cbc34dede3205a902095ecd26c21e3.patch"; + sha256 = "0l8jk0w0wavagzck0vy5m0s6fhxab0hpdr4ib111bacqrvvda3kd"; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip {