diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-05 23:37:43 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-14 12:21:51 +0000 |
| commit | b8734c50e2942560be9ab5bb1da1b93ea55c8f93 (patch) | |
| tree | 67fb922a1fa06165e6dac5339501cb33176ab5d0 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 6a55e05cf899a154321f0fb46ac4938155952cc5 (diff) | |
| download | nixpkgs-b8734c50e2942560be9ab5bb1da1b93ea55c8f93.tar nixpkgs-b8734c50e2942560be9ab5bb1da1b93ea55c8f93.tar.gz nixpkgs-b8734c50e2942560be9ab5bb1da1b93ea55c8f93.tar.bz2 nixpkgs-b8734c50e2942560be9ab5bb1da1b93ea55c8f93.tar.lz nixpkgs-b8734c50e2942560be9ab5bb1da1b93ea55c8f93.tar.xz nixpkgs-b8734c50e2942560be9ab5bb1da1b93ea55c8f93.tar.zst nixpkgs-b8734c50e2942560be9ab5bb1da1b93ea55c8f93.zip | |
pkgsMusl.systemdMinimal: fix build
Use latest patches from OpenEmbedded. pkgsMusl.systemd doesn't build yet because pkgsMusl.libnetfilter_conntrack is currently broken.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 39679b31764..fda8092ec98 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -181,8 +181,8 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2"; - sha256 = "1jixya4czkr5p5rdcw3d6ips8zzr82dvnanvzvgjh67730scflya"; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-7e35a575ef09a85e625a81e0b4d80b020e3e3a92.tar.bz2"; + sha256 = "0dvz4685nk0y7nnq3sr2q8ab3wfx0bi8ilwcgn0h6kagwcnav2n8"; }; musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in @@ -191,7 +191,6 @@ stdenv.mkDerivation { (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch") (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch") (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch") - (musl-patches + "/0006-Include-netinet-if_ether.h.patch") (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch") (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch") (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch") @@ -210,9 +209,7 @@ stdenv.mkDerivation { (musl-patches + "/0025-Handle-__cpu_mask-usage.patch") (musl-patches + "/0026-Handle-missing-gshadow.patch") (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") - - # Being discussed upstream: https://lists.openembedded.org/g/openembedded-core/topic/86411771#157056 - ./musl.diff + (musl-patches + "/0001-Adjust-for-musl-headers.patch") ] ); |