Adding pygobject3 (for bluez4).

bluez-simple-agent fails to work otherwise.
We discussed this a bit on #486, and this looks like the simplest way to
get bluez-simple-agent again.
This commit is contained in:
Lluís Batlle i Rossell 2013-05-09 19:11:30 +00:00
parent 43615a640f
commit ac4dcaba52
3 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
stdenv.mkDerivation rec {
name = "pygobject-3.0.4";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/${name}.tar.xz";
sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661";
};
configureFlags = "--disable-introspection";
buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ];
meta = {
homepage = http://live.gnome.org/PyGObject;
description = "Python bindings for Glib";
};
}

View File

@ -5415,6 +5415,8 @@ let
pygobject = pythonPackages.pygobject; pygobject = pythonPackages.pygobject;
pygobject3 = pythonPackages.pygobject3;
pygtk = pythonPackages.pygtk; pygtk = pythonPackages.pygtk;
pyGtkGlade = pythonPackages.pyGtkGlade; pyGtkGlade = pythonPackages.pyGtkGlade;
@ -5762,7 +5764,10 @@ let
bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { };
bluez4 = callPackage ../os-specific/linux/bluez { }; bluez4 = callPackage ../os-specific/linux/bluez {
pygobject = pygobject3;
};
bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { });
bluez = bluez4; bluez = bluez4;

View File

@ -91,6 +91,11 @@ pythonPackages = python.modules // rec {
inherit python; inherit python;
}; };
pygobject3 = import ../development/python-modules/pygobject/3.nix {
inherit (pkgs) stdenv fetchurl pkgconfig glib gobjectIntrospection cairo;
inherit python pycairo;
};
pygtk = import ../development/python-modules/pygtk { pygtk = import ../development/python-modules/pygtk {
inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; inherit (pkgs) fetchurl stdenv pkgconfig glib gtk;
inherit python buildPythonPackage pygobject pycairo; inherit python buildPythonPackage pygobject pycairo;