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
+2 -2
View File
@@ -1,11 +1,11 @@
{ callPackage, python, dbus_python, intltool, makeWrapper }:
{ callPackage, pythonPackages, intltool, makeWrapper }:
let pkg = import ./base.nix {
version = "3.0.1";
pkgName = "cdemu-client";
pkgSha256 = "1kg5m7npdxli93vihhp033hgkvikw5b6fm0qwgvlvdjby7njyyyg";
};
in callPackage pkg {
buildInputs = [ python dbus_python intltool makeWrapper ];
buildInputs = [ pythonPackages.python pythonPackages.dbus-python intltool makeWrapper ];
drvParams = {
postFixup = ''
wrapProgram $out/bin/cdemu \