jfsrec: Remove derivation

This commit is contained in:
William A. Kennington III 2014-10-29 01:13:26 -07:00
parent 94f80e66d3
commit 5ae216558f
6 changed files with 0 additions and 52 deletions

View File

@ -76,7 +76,6 @@ in
pkgs.ntfsprogs # for resizing NTFS partitions pkgs.ntfsprogs # for resizing NTFS partitions
pkgs.btrfsProgs pkgs.btrfsProgs
pkgs.jfsutils pkgs.jfsutils
pkgs.jfsrec
# Some compression/archiver tools. # Some compression/archiver tools.
pkgs.unzip pkgs.unzip

View File

@ -34,7 +34,6 @@
pkgs.xfsprogs pkgs.xfsprogs
pkgs.jfsutils pkgs.jfsutils
pkgs.f2fs-tools pkgs.f2fs-tools
#pkgs.jfsrec # disabled because of Boost dependency
# Some compression/archiver tools. # Some compression/archiver tools.
pkgs.unzip pkgs.unzip

View File

@ -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/;
};
}

View File

@ -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
/*

View File

@ -1479,8 +1479,6 @@ let
jdiskreport = callPackage ../tools/misc/jdiskreport { }; jdiskreport = callPackage ../tools/misc/jdiskreport { };
jfsrec = callPackage ../tools/filesystems/jfsrec { };
jfsutils = callPackage ../tools/filesystems/jfsutils { }; jfsutils = callPackage ../tools/filesystems/jfsutils { };
jhead = callPackage ../tools/graphics/jhead { }; jhead = callPackage ../tools/graphics/jhead { };

View File

@ -129,7 +129,6 @@ let
inkscape = linux; inkscape = linux;
irssi = linux; irssi = linux;
jfsutils = linux; jfsutils = linux;
jfsrec = linux;
jnettop = linux; jnettop = linux;
jwhois = linux; jwhois = linux;
kbd = linux; kbd = linux;