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:
@@ -1,8 +1,10 @@
|
||||
{ stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus
|
||||
{ stdenv, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit
|
||||
, lndir, makeWrapper, qmakeHook }:
|
||||
|
||||
let
|
||||
version = "5.5.1";
|
||||
inherit (pythonPackages) python dbus-python;
|
||||
sip = pythonPackages.sip_4_16;
|
||||
in stdenv.mkDerivation {
|
||||
name = "${python.libPrefix}-PyQt-${version}";
|
||||
|
||||
@@ -30,7 +32,7 @@ in stdenv.mkDerivation {
|
||||
runHook preConfigure
|
||||
|
||||
mkdir -p $out
|
||||
lndir ${pythonDBus} $out
|
||||
lndir ${dbus-python} $out
|
||||
|
||||
export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
|
||||
|
||||
|
||||
Reference in New Issue
Block a user