diff options
-rw-r--r-- | pkgs/tools/filesystems/jfsrec/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix index a805e86f0dd6..91060795e7cd 100644 --- a/pkgs/tools/filesystems/jfsrec/default.nix +++ b/pkgs/tools/filesystems/jfsrec/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg"; }; + patches = [ ./jfsrec-gcc-4.3.patch ]; buildInputs = [ boost ]; preConfigure = diff --git a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch b/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch new file mode 100644 index 000000000000..063a7c24813b --- /dev/null +++ b/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch @@ -0,0 +1,24 @@ +Taken from Archlinux, although this solves the build in gcc 4.4, not 4.3. +http://aur.archlinux.org/packages/jfsrec-svn/jfsrec-svn/jfsrec-gcc-4.3.patch +diff -uBdr jfsrec/src/device.cpp jfsrec-build/src/device.cpp +--- jfsrec/src/device.cpp 2009-12-01 18:34:03.860437077 +0100 ++++ jfsrec-build/src/device.cpp 2009-12-01 18:39:48.297067088 +0100 +@@ -20,6 +20,7 @@ + //Parts of the code in this file was originally taken from JFS's xpeek (debugfs_jfs) + + #include "device.h" ++#include <stdio.h> + #ifdef __linux__ + #include <linux/fs.h> + #include <sys/ioctl.h> +diff -uBdr jfsrec/src/unicode_to_utf8.cpp jfsrec-build/src/unicode_to_utf8.cpp +--- jfsrec/src/unicode_to_utf8.cpp 2009-12-01 18:34:03.860437077 +0100 ++++ jfsrec-build/src/unicode_to_utf8.cpp 2009-12-01 18:39:43.501626737 +0100 +@@ -8,6 +8,7 @@ + */ + #include <config.h> + #include "unicode_to_utf8.h" ++#include <string.h> + #define JFS_PATH_MAX 4096 + + /* |