Commit 7be23ec0 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

Revert "libeatmydata: patch out LFS64 usage" 

This reverts commit c7f51f00.

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
parent 5efb745b

pkgs/development/libraries/libeatmydata/default.nix

+0 −11
Original line number Diff line number Diff line
@@ -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 = ''