From 7c92bab1e5c4515f625935d6a9b06c4309e42fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Sat, 10 Mar 2012 11:26:55 +0000
Subject: [PATCH] Made xbursttools have libusb and libusb1. Looks like
depending on both.
svn path=/nixpkgs/trunk/; revision=32969
---
pkgs/tools/misc/xburst-tools/default.nix | 4 ++--
pkgs/top-level/all-packages.nix | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index 7bd5ccddee0e..563406e430b8 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 = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e73b1b8bf8..a267d5137ac6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1580,8 +1580,7 @@ let
x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools {
- inherit stdenv fetchgit autoconf automake confuse pkgconfig;
- libusb = libusb1;
+ inherit stdenv fetchgit autoconf automake confuse pkgconfig libusb libusb1;
# It needs a cross compiler for mipsel to build the firmware it will
# load into the Ben Nanonote
gccCross =