tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
jfsrec: Remove derivation
William A. Kennington III
11 years ago
5ae21655
94f80e66
-52
6 changed files
expand all
collapse all
unified
split
nixos
modules
installer
cd-dvd
system-tarball-fuloong2f.nix
profiles
base.nix
pkgs
tools
filesystems
jfsrec
default.nix
jfsrec-gcc-4.3.patch
top-level
all-packages.nix
release.nix
-1
nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
···
76
76
pkgs.ntfsprogs # for resizing NTFS partitions
77
77
pkgs.btrfsProgs
78
78
pkgs.jfsutils
79
79
-
pkgs.jfsrec
80
79
81
80
# Some compression/archiver tools.
82
81
pkgs.unzip
-1
nixos/modules/profiles/base.nix
···
34
34
pkgs.xfsprogs
35
35
pkgs.jfsutils
36
36
pkgs.f2fs-tools
37
37
-
#pkgs.jfsrec # disabled because of Boost dependency
38
37
39
38
# Some compression/archiver tools.
40
39
pkgs.unzip
-23
pkgs/tools/filesystems/jfsrec/default.nix
···
1
1
-
{ stdenv, fetchurl, boost }:
2
2
-
3
3
-
stdenv.mkDerivation {
4
4
-
name = "jfsrec-0-pre-svn-7";
5
5
-
6
6
-
src = fetchurl {
7
7
-
url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz;
8
8
-
sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
9
9
-
};
10
10
-
11
11
-
patches = [ ./jfsrec-gcc-4.3.patch ];
12
12
-
buildInputs = [ boost ];
13
13
-
14
14
-
preConfigure =
15
15
-
''
16
16
-
sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
17
17
-
'';
18
18
-
19
19
-
meta = {
20
20
-
description = "JFS recovery tool";
21
21
-
homepage = http://jfsrec.sourceforge.net/;
22
22
-
};
23
23
-
}
-24
pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
···
1
1
-
Taken from Archlinux, although this solves the build in gcc 4.4, not 4.3.
2
2
-
http://aur.archlinux.org/packages/jfsrec-svn/jfsrec-svn/jfsrec-gcc-4.3.patch
3
3
-
diff -uBdr jfsrec/src/device.cpp jfsrec-build/src/device.cpp
4
4
-
--- jfsrec/src/device.cpp 2009-12-01 18:34:03.860437077 +0100
5
5
-
+++ jfsrec-build/src/device.cpp 2009-12-01 18:39:48.297067088 +0100
6
6
-
@@ -20,6 +20,7 @@
7
7
-
//Parts of the code in this file was originally taken from JFS's xpeek (debugfs_jfs)
8
8
-
9
9
-
#include "device.h"
10
10
-
+#include <stdio.h>
11
11
-
#ifdef __linux__
12
12
-
#include <linux/fs.h>
13
13
-
#include <sys/ioctl.h>
14
14
-
diff -uBdr jfsrec/src/unicode_to_utf8.cpp jfsrec-build/src/unicode_to_utf8.cpp
15
15
-
--- jfsrec/src/unicode_to_utf8.cpp 2009-12-01 18:34:03.860437077 +0100
16
16
-
+++ jfsrec-build/src/unicode_to_utf8.cpp 2009-12-01 18:39:43.501626737 +0100
17
17
-
@@ -8,6 +8,7 @@
18
18
-
*/
19
19
-
#include <config.h>
20
20
-
#include "unicode_to_utf8.h"
21
21
-
+#include <string.h>
22
22
-
#define JFS_PATH_MAX 4096
23
23
-
24
24
-
/*
-2
pkgs/top-level/all-packages.nix
···
1479
1479
1480
1480
jdiskreport = callPackage ../tools/misc/jdiskreport { };
1481
1481
1482
1482
-
jfsrec = callPackage ../tools/filesystems/jfsrec { };
1483
1483
-
1484
1482
jfsutils = callPackage ../tools/filesystems/jfsutils { };
1485
1483
1486
1484
jhead = callPackage ../tools/graphics/jhead { };
-1
pkgs/top-level/release.nix
···
129
129
inkscape = linux;
130
130
irssi = linux;
131
131
jfsutils = linux;
132
132
-
jfsrec = linux;
133
132
jnettop = linux;
134
133
jwhois = linux;
135
134
kbd = linux;