From be238f8aef65445e7d9b1452bcba970ebbe3f4c4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Jan 2020 12:55:11 +0100 Subject: [PATCH] ext4magic: fix build w/glibc-2.30 --- pkgs/tools/filesystems/ext4magic/default.nix | 1 + pkgs/tools/filesystems/ext4magic/glibc-fix.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/filesystems/ext4magic/glibc-fix.patch diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index 40159b5fb6e6..1e1edfab8dd1 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch; sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c"; }) + ./glibc-fix.patch ]; buildInputs = [ file libuuid e2fsprogs zlib bzip2 ]; diff --git a/pkgs/tools/filesystems/ext4magic/glibc-fix.patch b/pkgs/tools/filesystems/ext4magic/glibc-fix.patch new file mode 100644 index 000000000000..906609788939 --- /dev/null +++ b/pkgs/tools/filesystems/ext4magic/glibc-fix.patch @@ -0,0 +1,12 @@ +diff --git a/src/recover.c b/src/recover.c +index 41b4aee..30b5d8f 100644 +--- a/src/recover.c ++++ b/src/recover.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #ifndef O_LARGEFILE + #define O_LARGEFILE 0