* Updated bluez and obexd.

svn path=/nixpkgs/trunk/; revision=22211
This commit is contained in:
Eelco Dolstra 2010-06-10 12:47:58 +00:00
parent 4f6613b267
commit 8b18623656
3 changed files with 10 additions and 10 deletions

View File

@ -1,16 +1,16 @@
{stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib}: { stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib }:
assert stdenv.isLinux; assert stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bluez-4.54"; name = "bluez-4.65";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
sha256 = "1ykhyin06gzim4496sgr89x2yaqh4nrwmnfzrp20kiqfslw6fzlp"; sha256 = "08j9h2cm0d4ifq8jna9lgfg37b3bncmjgxm9nirdrsr6505542sz";
}; };
buildInputs = [pkgconfig dbus.libs glib libusb alsaLib]; buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib ];
configureFlags = "--localstatedir=/var"; configureFlags = "--localstatedir=/var";

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez }: { stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "obexd-0.18"; name = "obexd-0.27";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
sha256 = "0a3jpkgg8skiqmy2ksfffmwysji4dnd4h9fc46nj0wcn8n9vvfkd"; sha256 = "17vlrhn1wgsbdd7f0ggw5nvs657miilhi5jc05pfmi4h18b8710l";
}; };
buildInputs = [ pkgconfig glib dbus.libs openobex bluez ]; buildInputs = [ pkgconfig glib dbus.libs openobex bluez libical ];
meta = { meta = {
homepage = http://www.bluez.org/; homepage = http://www.bluez.org/;

View File

@ -1253,7 +1253,7 @@ let
}; };
obexd = import ../tools/bluetooth/obexd { obexd = import ../tools/bluetooth/obexd {
inherit fetchurl stdenv pkgconfig dbus openobex bluez glib; inherit fetchurl stdenv pkgconfig dbus openobex bluez glib libical;
}; };
obexfs = import ../tools/bluetooth/obexfs { obexfs = import ../tools/bluetooth/obexfs {