alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Made xbursttools have libusb and libusb1. Looks like depending on both.

Browse source 
svn path=/nixpkgs/trunk/; revision=32969
This commit is contained in:
Lluís Batlle i Rossell 2012-03-10 11:26:55 +00:00
parent 313191412d
commit 7c92bab1e5
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/misc/xburst-tools/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, libusb, autoconf, automake, confuse, pkgconfig { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig
, gccCross ? null }: , gccCross ? null }:
let let
@ -25,7 +25,7 @@ stdenv.mkDerivation {
dontCrossStrip = true; dontCrossStrip = true;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
buildInputs = [ libusb autoconf automake confuse ] ++ buildInputs = [ libusb libusb1 autoconf automake confuse ] ++
stdenv.lib.optional (gccCross != null) gccCross; stdenv.lib.optional (gccCross != null) gccCross;
meta = { meta = {

3
pkgs/top-level/all-packages.nix
View file

@ -1580,8 +1580,7 @@ let
x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools { xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools {
inherit stdenv fetchgit autoconf automake confuse pkgconfig; inherit stdenv fetchgit autoconf automake confuse pkgconfig libusb libusb1;
libusb = libusb1;
# It needs a cross compiler for mipsel to build the firmware it will # It needs a cross compiler for mipsel to build the firmware it will
# load into the Ben Nanonote # load into the Ben Nanonote
gccCross = gccCross =