diff options
author | William A. Kennington III <william@wkennington.com> | 2014-10-29 01:13:26 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-11-02 17:22:27 -0800 |
commit | 5ae216558f568102b260666315d27de2e4cb4530 (patch) | |
tree | 4565c03e2a67f1376204353c78dacbefb5c092cb /pkgs/tools | |
parent | 94f80e66d33d740835b0c2efc8215a649e53b288 (diff) | |
download | nixlib-5ae216558f568102b260666315d27de2e4cb4530.tar nixlib-5ae216558f568102b260666315d27de2e4cb4530.tar.gz nixlib-5ae216558f568102b260666315d27de2e4cb4530.tar.bz2 nixlib-5ae216558f568102b260666315d27de2e4cb4530.tar.lz nixlib-5ae216558f568102b260666315d27de2e4cb4530.tar.xz nixlib-5ae216558f568102b260666315d27de2e4cb4530.tar.zst nixlib-5ae216558f568102b260666315d27de2e4cb4530.zip |
jfsrec: Remove derivation
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/jfsrec/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch | 24 |
2 files changed, 0 insertions, 47 deletions
diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix deleted file mode 100644 index 5b5e7c8808e1..000000000000 --- a/pkgs/tools/filesystems/jfsrec/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, boost }: - -stdenv.mkDerivation { - name = "jfsrec-0-pre-svn-7"; - - src = fetchurl { - url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz; - sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg"; - }; - - patches = [ ./jfsrec-gcc-4.3.patch ]; - buildInputs = [ boost ]; - - preConfigure = - '' - sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp - ''; - - meta = { - description = "JFS recovery tool"; - homepage = http://jfsrec.sourceforge.net/; - }; -} diff --git a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch b/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch deleted file mode 100644 index 063a7c24813b..000000000000 --- a/pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - - /* |