@ -843,14 +843,7 @@ in
mpdcron = callPackage ../tools/audio/mpdcron { } ;
mpdris2 = callPackage ../tools/audio/mpdris2 {
python = pythonFull ;
wrapPython = pythonPackages . wrapPython ;
mpd = pythonPackages . mpd ;
pygtk = pythonPackages . pygtk ;
dbus = pythonPackages . dbus ;
pynotify = pythonPackages . notify ;
} ;
mpdris2 = callPackage ../tools/audio/mpdris2 { } ;
playerctl = callPackage ../tools/audio/playerctl { } ;
@ -3204,8 +3197,6 @@ in
pystringtemplate = callPackage ../development/python-modules/stringtemplate { } ;
pythonDBus = self . dbus_python ;
pythonIRClib = pythonPackages . pythonIRClib ;
pythonSexy = callPackage ../development/python-modules/libsexy { } ;
@ -3530,9 +3521,7 @@ in
sonarr = callPackage ../servers/sonarr { } ;
sonata = callPackage ../applications/audio/sonata {
inherit ( python3Packages ) buildPythonApplication python isPy3k dbus pygobject3 mpd2 ;
} ;
sonata = callPackage ../applications/audio/sonata { } ;
sparsehash = callPackage ../development/libraries/sparsehash { } ;
@ -7104,7 +7093,6 @@ in
dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { } ;
dbus_glib = callPackage ../development/libraries/dbus-glib { } ;
dbus_java = callPackage ../development/libraries/java/dbus-java { } ;
dbus_python = self . pythonPackages . dbus ;
dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { } ;
dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { } ;
@ -10767,10 +10755,6 @@ in
blktrace = callPackage ../os-specific/linux/blktrace { } ;
bluez4 = lowPrio ( callPackage ../os-specific/linux/bluez {
pygobject = pygobject3 ;
} ) ;
bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { } ;
# Needed for LibreOffice
@ -10920,7 +10904,7 @@ in
fatrace = callPackage ../os-specific/linux/fatrace { } ;
ffadoFull = callPackage ../os-specific/linux/ffado {
inherit ( pythonPackages ) python pyqt4 ;
inherit ( pythonPackages ) python pyqt4 dbus-python ;
} ;
libffado = self . ffadoFull . override { prefix = " l i b " ; } ;
@ -13426,7 +13410,6 @@ in
hakuneko = callPackage ../tools/misc/hakuneko { } ;
hamster-time-tracker = callPackage ../applications/misc/hamster-time-tracker {
inherit ( pythonPackages ) pyxdg pygtk dbus sqlite3 ;
inherit ( gnome ) gnome_python ;
} ;
@ -14462,12 +14445,9 @@ in
quirc = callPackage ../tools/graphics/quirc { } ;
quodlibet = callPackage ../applications/audio/quodlibet {
inherit ( pythonPackages ) mutagen ;
} ;
quodlibet = callPackage ../applications/audio/quodlibet { } ;
quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet {
inherit ( pythonPackages ) mutagen ;
withGstPlugins = true ;
gst_plugins_bad = null ;
} ;