cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

systemd: fix build on riscv64 and ppc64

Browse source
This commit is contained in:
Steven Keuchel 2024-03-09 15:24:54 +01:00
parent 9289a0678e
commit 51a023952a
No known key found for this signature in database
GPG key ID: 5877DEE97428557F
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/systemd/default.nix
View file

@ -5,6 +5,7 @@
, nixosTests , nixosTests
, pkgsCross , pkgsCross
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, fetchzip , fetchzip
, buildPackages , buildPackages
, makeBinaryWrapper , makeBinaryWrapper
@ -224,6 +225,15 @@ stdenv.mkDerivation (finalAttrs: {
./0017-meson.build-do-not-create-systemdstatedir.patch ./0017-meson.build-do-not-create-systemdstatedir.patch
] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch ./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 ( ] ++ lib.optional stdenv.hostPlatform.isMusl (
let let
oe-core = fetchzip { oe-core = fetchzip {