From 25859fae742fecfeee62151369d1662815c540fe Mon Sep 17 00:00:00 2001 From: Alexander Flatter Date: Tue, 11 Nov 2014 15:46:47 +0100 Subject: [PATCH] Use libusb-compat instead of unmaintained libusb Close #4945. --- pkgs/development/libraries/libusb/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index ac06b4893f1e..efdbc6e22a72 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -1,16 +1,12 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, pkgconfig, libusb1}: stdenv.mkDerivation { - name = "libusb-0.1.12"; + name = "libusb-compat-0.1.5"; - # On non-linux, we get warnings compiling, and we don't want the - # build to break. - patchPhase = '' - sed -i s/-Werror// Makefile.in - ''; + buildInputs = [ pkgconfig libusb1 ]; src = fetchurl { - url = mirror://sourceforge/libusb/libusb-0.1.12.tar.gz; - sha256 = "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"; + url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2; + sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0"; }; }