BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkgsMusl.systemd: fix build by updating patchset

Browse source
This commit is contained in:
Alyssa Ross 2023-01-11 06:16:18 +00:00
parent 0debb0b193
commit 820f3452f4
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@
, fetchFromGitHub
, fetchpatch
, fetchzip
, applyPatches
, buildPackages
, makeBinaryWrapper
, ninja
@ -89,7 +88,7 @@
, withDocumentation ? true
, withEfi ? stdenv.hostPlatform.isEfi && !stdenv.hostPlatform.isMusl
, withFido2 ? true
, withHomed ? true
, withHomed ? !stdenv.hostPlatform.isMusl
, withHostnamed ? true
, withHwdb ? true
, withImportd ? !stdenv.hostPlatform.isMusl
@ -177,20 +176,10 @@ stdenv.mkDerivation {
] ++ lib.optional stdenv.hostPlatform.isMusl (
let
oe-core = fetchzip {
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-d43ec090ceb2bf0016a065103a4c34d0c43cb906.tar.gz";
sha256 = "sha256-e5rHmz0uyNgJwrAj96VGWWu9YHhZtJXoDpCtj17eC5w=";
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-cccd4bcaf381c2729adc000381bd89906003e72a.tar.gz";
sha256 = "2CFZEzWqUy6OOF3c+LN4Zmy3RqMzfdRHp+B5zlWJsoE=";
};
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";
musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
in
[
(musl-patches + "/0003-missing_type.h-add-comparison_fn_t.patch")
@ -212,8 +201,7 @@ 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")
(musl-patches + "/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch")
]
);