diff options
| author | Yureka <yuka@yuka.dev> | 2022-12-08 13:25:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-08 13:25:52 +0100 |
| commit | ee89367a3d9f21a46be9132f22e19ecb3c80260c (patch) | |
| tree | 8a537630892c52332e85c6ae9b0792126ee8adda /pkgs/os-specific/linux/systemd/default.nix | |
| parent | e968b8b88d04064764520ed4127265103b2b8785 (diff) | |
| download | nixpkgs-ee89367a3d9f21a46be9132f22e19ecb3c80260c.tar nixpkgs-ee89367a3d9f21a46be9132f22e19ecb3c80260c.tar.gz nixpkgs-ee89367a3d9f21a46be9132f22e19ecb3c80260c.tar.bz2 nixpkgs-ee89367a3d9f21a46be9132f22e19ecb3c80260c.tar.lz nixpkgs-ee89367a3d9f21a46be9132f22e19ecb3c80260c.tar.xz nixpkgs-ee89367a3d9f21a46be9132f22e19ecb3c80260c.tar.zst nixpkgs-ee89367a3d9f21a46be9132f22e19ecb3c80260c.zip | |
pkgsMusl.systemd: fix build (#204221)
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7c57d9edf60..0178cd7d6d4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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") ] ); |