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.
This commit is contained in:
Frederik Rietdijk
2016-08-16 22:52:37 +02:00
parent 6b23bd99a3
commit 5a501bd828
45 changed files with 166 additions and 171 deletions
+6 -7
View File
@@ -1,14 +1,13 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper
, pythonDBus, pygobject, readline, libsndfile }:
{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, pythonPackages, makeWrapper
, readline, libsndfile }:
assert stdenv.isLinux;
let
pythonpath = "${pythonDBus}/lib/${python.libPrefix}/site-packages:"
+ "${pygobject}/lib/${python.libPrefix}/site-packages";
in
stdenv.mkDerivation rec {
inherit (pythonPackages) python;
pythonpath = "${pythonPackages.dbus}/lib/${python.libPrefix}/site-packages:"
+ "${pythonPackages.pygobject}/lib/${python.libPrefix}/site-packages";
in stdenv.mkDerivation rec {
name = "bluez-4.101";
src = fetchurl {