From ac4dcaba52faeb4410c0bfcd9e300ce727e15026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 9 May 2013 19:11:30 +0000 Subject: [PATCH] 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. --- .../python-modules/pygobject/3.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++- pkgs/top-level/python-packages.nix | 5 +++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pygobject/3.nix diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix new file mode 100644 index 000000000000..b5b8f8408aa5 --- /dev/null +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd31fc1a4e29..3bdbc58c4a23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5415,6 +5415,8 @@ let pygobject = pythonPackages.pygobject; + pygobject3 = pythonPackages.pygobject3; + pygtk = pythonPackages.pygtk; pyGtkGlade = pythonPackages.pyGtkGlade; @@ -5762,7 +5764,10 @@ let 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 { }); bluez = bluez4; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecc553f85e4f..fd454d3c45c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -91,6 +91,11 @@ pythonPackages = python.modules // rec { 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 { inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; inherit python buildPythonPackage pygobject pycairo;