alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pkgsMusl.systemd: fix build (#204221)

Browse source
This commit is contained in:
Yureka 2022-12-08 13:25:52 +01:00 committed by GitHub
parent e968b8b88d
commit ee89367a3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@
, fetchFromGitHub
, fetchpatch
, fetchzip
, applyPatches
, buildPackages
, makeBinaryWrapper
, ninja
@ -79,7 +80,7 @@
, withCoredump ? true
, withCryptsetup ? true
, withDocumentation ? true
, withEfi ? stdenv.hostPlatform.isEfi
, withEfi ? stdenv.hostPlatform.isEfi && !stdenv.hostPlatform.isMusl
, withFido2 ? true
, withHomed ? false
, withHostnamed ? true
@ -169,10 +170,20 @@ stdenv.mkDerivation {
] ++ lib.optional stdenv.hostPlatform.isMusl (
let
oe-core = fetchzip {
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-86a33f98a7c0d6f2c2b51d02ba9e01b63062cf98.tar.bz2";
sha256 = "081j01sw21hl405l7g9z4bavvq0q0k4g80365677m0ykhiqlx3am";
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-d43ec090ceb2bf0016a065103a4c34d0c43cb906.tar.gz";
sha256 = "sha256-e5rHmz0uyNgJwrAj96VGWWu9YHhZtJXoDpCtj17eC5w=";
};
musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
oe-core-patched = applyPatches {
src = oe-core;
patches = [
(fetchpatch {
url = "https://lore.kernel.org/all/20221109002306.853567-1-raj.khem@gmail.com/raw";
includes = [ "meta/recipes-core/systemd/systemd/*" ];
sha256 = "sha256-aPJjN4vesZwFzgY4Nb6uaIuHz/quH1HccSVEof32IOU=";
})
];
};
musl-patches = oe-core-patched + "/meta/recipes-core/systemd/systemd";
in
[
(musl-patches + "/0003-missing_type.h-add-comparison_fn_t.patch")
@ -194,6 +205,8 @@ stdenv.mkDerivation {
(musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch")
(musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch")
(musl-patches + "/0001-Adjust-for-musl-headers.patch")
(musl-patches + "/0001-networkd-ipv4acd.c-Use-net-if.h-for-getting-IFF_LOOP.patch")
(musl-patches + "/0001-test-compile-test-utmp.c-only-if-UTMP-is-enabled.patch")
]
);