diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-16 22:51:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-16 22:52:37 +0200 |
| commit | 5a501bd828b19e9cef4589b3b9dc2852401a2882 (patch) | |
| tree | 49be7194446f7258b197ff0f29fc00d8eb939f02 /pkgs/desktops/gnome-2/bindings | |
| parent | 6b23bd99a31a450fede964206153ddd5ac76a22f (diff) | |
| download | nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.gz nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.bz2 nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.lz nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.xz nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.zst nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.zip | |
Remove top-level dbus_python and pythonDBus.
See #11567. Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus- python as that's the name upstream uses. There is a small rebuild but I couldn't figure out the actual cause.
Diffstat (limited to 'pkgs/desktops/gnome-2/bindings')
| -rw-r--r-- | pkgs/desktops/gnome-2/bindings/gnome-python/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 41ca17bd5e4..b019951db5f 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus, gnome_vfs}: +{ stdenv, fetchurl, pythonPackages, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs}: with stdenv.lib; -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject pygtk dbus-python; +in stdenv.mkDerivation rec { version = "2.28"; name = "gnome-python-${version}.1"; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/ ''; - buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus gnome_vfs ]; + buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; doCheck = false; |