diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-10 11:26:55 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-10 11:26:55 +0000 |
commit | 7c92bab1e5c4515f625935d6a9b06c4309e42fa1 (patch) | |
tree | 2633d6c9ca6cea3ce11b3d622416b0fb8f5a6713 /pkgs/tools/misc | |
parent | 313191412d059f696d70a801fddbdfabd4c9881a (diff) | |
download | nixpkgs-7c92bab1e5c4515f625935d6a9b06c4309e42fa1.tar nixpkgs-7c92bab1e5c4515f625935d6a9b06c4309e42fa1.tar.gz nixpkgs-7c92bab1e5c4515f625935d6a9b06c4309e42fa1.tar.bz2 nixpkgs-7c92bab1e5c4515f625935d6a9b06c4309e42fa1.tar.lz nixpkgs-7c92bab1e5c4515f625935d6a9b06c4309e42fa1.tar.xz nixpkgs-7c92bab1e5c4515f625935d6a9b06c4309e42fa1.tar.zst nixpkgs-7c92bab1e5c4515f625935d6a9b06c4309e42fa1.zip |
Made xbursttools have libusb and libusb1. Looks like depending on both.
svn path=/nixpkgs/trunk/; revision=32969
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/xburst-tools/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 7bd5ccddee0..563406e430b 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, autoconf, automake, confuse, pkgconfig +{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig , gccCross ? null }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { dontCrossStrip = true; buildNativeInputs = [ pkgconfig ]; - buildInputs = [ libusb autoconf automake confuse ] ++ + buildInputs = [ libusb libusb1 autoconf automake confuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; meta = { |