summary refs log tree commit diff
path: root/pkgs/os-specific/linux/ffado
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-08-16 22:51:21 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2016-08-16 22:52:37 +0200
commit5a501bd828b19e9cef4589b3b9dc2852401a2882 (patch)
tree49be7194446f7258b197ff0f29fc00d8eb939f02 /pkgs/os-specific/linux/ffado
parent6b23bd99a31a450fede964206153ddd5ac76a22f (diff)
downloadnixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.gz
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.bz2
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.lz
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.xz
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.zst
nixpkgs-5a501bd828b19e9cef4589b3b9dc2852401a2882.zip
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.
Diffstat (limited to 'pkgs/os-specific/linux/ffado')
-rw-r--r--pkgs/os-specific/linux/ffado/default.nix4
1 files changed, 2 insertions, 2 deletions
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 {