summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-01-25 12:55:11 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2020-01-25 12:55:11 +0100
commitbe238f8aef65445e7d9b1452bcba970ebbe3f4c4 (patch)
tree05744ff6afdb53f8a0d80e676dfb7c4b06a04ea2 /pkgs/tools/filesystems
parent4f5830cf9e2bc9eaae38a9adf9e515ecaa4b29cb (diff)
downloadnixpkgs-be238f8aef65445e7d9b1452bcba970ebbe3f4c4.tar
nixpkgs-be238f8aef65445e7d9b1452bcba970ebbe3f4c4.tar.gz
nixpkgs-be238f8aef65445e7d9b1452bcba970ebbe3f4c4.tar.bz2
nixpkgs-be238f8aef65445e7d9b1452bcba970ebbe3f4c4.tar.lz
nixpkgs-be238f8aef65445e7d9b1452bcba970ebbe3f4c4.tar.xz
nixpkgs-be238f8aef65445e7d9b1452bcba970ebbe3f4c4.tar.zst
nixpkgs-be238f8aef65445e7d9b1452bcba970ebbe3f4c4.zip
ext4magic: fix build w/glibc-2.30
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/ext4magic/default.nix1
-rw-r--r--pkgs/tools/filesystems/ext4magic/glibc-fix.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix
index 40159b5fb6e..1e1edfab8dd 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 00000000000..90660978893
--- /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 <errno.h>
+ #include <fcntl.h>
+ #include <utime.h>
++#include <sys/sysmacros.h>
+ 
+ #ifndef O_LARGEFILE
+ #define O_LARGEFILE 0