Revert "libeatmydata: patch out LFS64 usage"

This reverts commit c7f51f0032.

This broke 32-bit Glibc builds.  I've submitted a revised patch
upstream, but in the meantime, there's no point keeping this around,
since we didn't do the musl upgrade yet.

Link: https://github.com/NixOS/nixpkgs/pull/292654#issuecomment-2106318845
Link: https://github.com/stewartsmith/libeatmydata/pull/36
This commit is contained in:
Alyssa Ross 2024-05-13 10:02:11 +02:00
parent 5efb745b17
commit 7be23ec058

View File

@ -2,7 +2,6 @@
, stdenv
, fetchFromGitHub
, fetchpatch2
, fetchurl
, autoreconfHook
, strace
, which
@ -25,16 +24,6 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch";
hash = "sha256-MZfTgf2Qn94UpPlYNRM2zK99iKQorKQrlbU5/1WJhJM=";
})
# Don't use transitional LFS64 API, removed in musl 1.2.4.
(fetchurl {
url = "https://git.alpinelinux.org/aports/plain/main/libeatmydata/lfs64.patch?id=f87f2c59384cc4a8a1b71aaa875be2b3ae2dbce0";
hash = "sha256-5Jhy9gunKcbrSmLh0DoP/uwJLgaLd+zKV2iVxiDwiHs=";
})
];
configureFlags = [
"CFLAGS=-D_FILE_OFFSET_BITS=64"
];
postPatch = ''