From 5a501bd828b19e9cef4589b3b9dc2852401a2882 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 16 Aug 2016 22:51:21 +0200
Subject: 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.
---
 pkgs/os-specific/linux/ffado/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/os-specific/linux/ffado')

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index b0f545b2171..ff259dcfbb0 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -3,7 +3,7 @@
 
 # Optional dependencies
 , libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null
-, pyqt4 ? null, pythonDBus ? null, xdg_utils ? null
+, pyqt4 ? null, dbus-python ? null, xdg_utils ? null
 
 # Other Flags
 , prefix ? ""
@@ -20,7 +20,7 @@ let
   optDbus_cplusplus = shouldUsePkg dbus_cplusplus;
   optAlsaLib = shouldUsePkg alsaLib;
   optPyqt4 = shouldUsePkg pyqt4;
-  optPythonDBus = shouldUsePkg pythonDBus;
+  optPythonDBus = shouldUsePkg dbus-python;
   optXdg_utils = shouldUsePkg xdg_utils;
 in
 stdenv.mkDerivation rec {
-- 
cgit 1.4.1