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 -5
View File
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, python, pythonPackages, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, makeWrapper }:
let version = "4.11.3";
in
stdenv.mkDerivation {
let
version = "4.11.3";
inherit (pythonPackages) python dbus-python;
in stdenv.mkDerivation {
name = "${python.libPrefix}-PyQt-x11-gpl-${version}";
src = fetchurl {
@@ -12,7 +13,7 @@ stdenv.mkDerivation {
configurePhase = ''
mkdir -p $out
lndir ${pythonDBus} $out
lndir ${dbus-python} $out
export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages