diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libusb1/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/filesystems/jfsrec/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch | 24 |
3 files changed, 5 insertions, 55 deletions
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 8be17b289f7e5..884db2b3b25af 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,18 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev ? null }: -let - version = "1.0.18"; -in stdenv.mkDerivation rec { - name = "libusb-${version}"; # at 1.0.18 libusb joined with libusbx + name = "libusb-1.0.19"; src = fetchurl { - url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; - sha256 = "081px0j98az0pjwwyjlq4qcmfn194fvm3qd4im0r9pm58pn5qgy7"; + url = "mirror://sourceforge/libusb/${name}.tar.bz2"; + sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = stdenv.lib.optional (stdenv.isLinux) udev; + propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux udev; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix deleted file mode 100644 index 5b5e7c8808e17..0000000000000 --- 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 063a7c24813b1..0000000000000 --- 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 - - /* |