public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove top-level dbus_python and pythonDBus.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/telepathy/qt/default.nix
+6 -4
View File
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }:
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, pythonPackages, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, fetchpatch }:
stdenv.mkDerivation rec {
let
inherit (pythonPackages) python dbus-python;
in stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.6.1";
src = fetchurl {
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake pkgconfig python ];
propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib dbus-python ];
buildInputs = stdenv.lib.optional doCheck dbus_daemon;