Author: eelco Date: 2010-07-06 14:54:22 +0000 (Tue, 06 Jul 2010) New Revision: 22497
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22497&view=rev Added: nixpkgs/trunk/pkgs/tools/bluetooth/blueman/ nixpkgs/trunk/pkgs/tools/bluetooth/blueman/default.nix nixpkgs/trunk/pkgs/tools/bluetooth/obex-data-server/ nixpkgs/trunk/pkgs/tools/bluetooth/obex-data-server/default.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix nixpkgs/trunk/pkgs/top-level/python-packages.nix Log: * Added Blueman (a Bluetooth application). * Added obex-data-server and python-notify, needed by Blueman. Changes: Added: nixpkgs/trunk/pkgs/tools/bluetooth/blueman/default.nix =================================================================== --- nixpkgs/trunk/pkgs/tools/bluetooth/blueman/default.nix (rev 0) +++ nixpkgs/trunk/pkgs/tools/bluetooth/blueman/default.nix 2010-07-06 14:54:22 UTC (rev 22497) @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk +, notify, pythonDBus, bluez, glib, gtk, libstartup_notification +, makeWrapper, xdg_utils +}: + +stdenv.mkDerivation rec { + name = "blueman-1.21"; + + src = fetchurl { + url = "http://download.tuxfamily.org/blueman/${name}.tar.gz";; + sha256 = "1bz31w0cqcl77r7vfjwm9c4gmk4hvq3nqn1pjnd5qndia2mhs846"; + }; + + configureFlags = "--disable-polkit"; + + buildInputs = + [ pkgconfig intltool python pyrex pygobject pygtk notify pythonDBus + bluez glib gtk libstartup_notification makeWrapper + ]; + + # !!! Ugly. + PYTHONPATH = "${pygobject}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${notify}/lib/${python.libPrefix}/site-packages/gtk-2.0"; + + postInstall = + '' + # Create wrappers that set the environment correctly. + for i in $out/bin/* $out/libexec/*; do + wrapProgram $i \ + --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \ + --prefix PATH : ${xdg_utils}/bin + done + ''; # */ + + meta = { + homepage = http://blueman-project.org/; + description = "GTK+-based Bluetooth Manager"; + }; +} Added: nixpkgs/trunk/pkgs/tools/bluetooth/obex-data-server/default.nix =================================================================== --- nixpkgs/trunk/pkgs/tools/bluetooth/obex-data-server/default.nix (rev 0) +++ nixpkgs/trunk/pkgs/tools/bluetooth/obex-data-server/default.nix 2010-07-06 14:54:22 UTC (rev 22497) @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex }: + +stdenv.mkDerivation rec { + name = "obex-data-server-0.4.5"; + + src = fetchurl { + url = "http://tadas.dailyda.com/software/${name}.tar.gz";; + sha256 = "0qy7mrwr3xfplcxlrq97hiiyda7r9jn24015y9azahi7q5xjfhg7"; + }; + + buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex ]; + + meta = { + homepage = http://wiki.muiline.com/obex-data-server; + }; +} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-06 12:34:05 UTC (rev 22496) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-06 14:54:22 UTC (rev 22497) @@ -477,6 +477,14 @@ inherit fetchurl stdenv python wxPython26; }; + blueman = import ../tools/bluetooth/blueman { + inherit fetchurl stdenv pkgconfig intltool python pyrex + pygobject pygtk pythonDBus bluez libstartup_notification + makeWrapper xdg_utils; + inherit (pythonPackages) notify; + inherit (gtkLibs) glib gtk; + }; + bmrsa = builderDefsPackage (import ../tools/security/bmrsa/11.nix) { inherit unzip; }; @@ -1286,6 +1294,11 @@ inherit fetchurl stdenv libevent; }; + obex_data_server = import ../tools/bluetooth/obex-data-server { + inherit fetchurl stdenv pkgconfig libusb dbus_glib bluez openobex; + inherit (gtkLibs) glib; + }; + obexd = import ../tools/bluetooth/obexd { inherit fetchurl stdenv pkgconfig dbus openobex bluez glib libical; }; Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/python-packages.nix 2010-07-06 12:34:05 UTC (rev 22496) +++ nixpkgs/trunk/pkgs/top-level/python-packages.nix 2010-07-06 14:54:22 UTC (rev 22497) @@ -395,6 +395,22 @@ }; }); + notify = pkgs.stdenv.mkDerivation (rec { + name = "python-notify-0.1.1"; + + src = fetchurl { + url = http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2; + sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; + }; + + buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ]; + + meta = { + description = "Python bindings for libnotify"; + homepage = http://www.galago-project.org/; + }; + }); + numpy = buildPythonPackage ( rec { name = "numpy-1.4.1"; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
