pyrox.dev
libusb: 1.0.18 -> 1.0.19
+5
-8
pkgs/development/libraries/libusb1/default.nix
+5
-8
pkgs/development/libraries/libusb1/default.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, udev }:
1
+
{ stdenv, fetchurl, pkgconfig, udev ? null }:
2
2
3
-
let
4
-
version = "1.0.18";
5
-
in
6
3
stdenv.mkDerivation rec {
7
-
name = "libusb-${version}"; # at 1.0.18 libusb joined with libusbx
4
+
name = "libusb-1.0.19";
8
5
9
6
src = fetchurl {
10
-
url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2";
11
-
sha256 = "081px0j98az0pjwwyjlq4qcmfn194fvm3qd4im0r9pm58pn5qgy7";
7
+
url = "mirror://sourceforge/libusb/${name}.tar.bz2";
8
+
sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c";
12
9
};
13
10
14
11
buildInputs = [ pkgconfig ];
15
-
propagatedBuildInputs = stdenv.lib.optional (stdenv.isLinux) udev;
12
+
propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux udev;
16
13
17
14
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
18
15
-23
pkgs/tools/filesystems/jfsrec/default.nix
-23
pkgs/tools/filesystems/jfsrec/default.nix
···
1
-
{ stdenv, fetchurl, boost }:
2
-
3
-
stdenv.mkDerivation {
4
-
name = "jfsrec-0-pre-svn-7";
5
-
6
-
src = fetchurl {
7
-
url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz;
8
-
sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
9
-
};
10
-
11
-
patches = [ ./jfsrec-gcc-4.3.patch ];
12
-
buildInputs = [ boost ];
13
-
14
-
preConfigure =
15
-
''
16
-
sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
17
-
'';
18
-
19
-
meta = {
20
-
description = "JFS recovery tool";
21
-
homepage = http://jfsrec.sourceforge.net/;
22
-
};
23
-
}
-24
pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
-24
pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
···
1
-
Taken from Archlinux, although this solves the build in gcc 4.4, not 4.3.
2
-
http://aur.archlinux.org/packages/jfsrec-svn/jfsrec-svn/jfsrec-gcc-4.3.patch
3
-
diff -uBdr jfsrec/src/device.cpp jfsrec-build/src/device.cpp
4
-
--- jfsrec/src/device.cpp 2009-12-01 18:34:03.860437077 +0100
5
-
+++ jfsrec-build/src/device.cpp 2009-12-01 18:39:48.297067088 +0100
6
-
@@ -20,6 +20,7 @@
7
-
//Parts of the code in this file was originally taken from JFS's xpeek (debugfs_jfs)
8
-
9
-
#include "device.h"
10
-
+#include <stdio.h>
11
-
#ifdef __linux__
12
-
#include <linux/fs.h>
13
-
#include <sys/ioctl.h>
14
-
diff -uBdr jfsrec/src/unicode_to_utf8.cpp jfsrec-build/src/unicode_to_utf8.cpp
15
-
--- jfsrec/src/unicode_to_utf8.cpp 2009-12-01 18:34:03.860437077 +0100
16
-
+++ jfsrec-build/src/unicode_to_utf8.cpp 2009-12-01 18:39:43.501626737 +0100
17
-
@@ -8,6 +8,7 @@
18
-
*/
19
-
#include <config.h>
20
-
#include "unicode_to_utf8.h"
21
-
+#include <string.h>
22
-
#define JFS_PATH_MAX 4096
23
-
24
-
/*