ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

libusb: 1.0.18 -> 1.0.19

Browse Source
This commit is contained in:
William A. Kennington III 2014-10-29 02:04:14 -07:00
parent b7eead88bd
commit 06f8885609
3 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libusb1/default.nix
View File

@ -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";

23
pkgs/tools/filesystems/jfsrec/default.nix
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/;
};
}

24
pkgs/tools/filesystems/jfsrec/jfsrec-gcc-4.3.patch
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
/*