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/applications/audio/quodlibet/default.nix
+7 -7
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, buildPythonApplication, mutagen, pygtk, pygobject, intltool
, pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null
{ stdenv, fetchurl, pythonPackages, intltool
, gst_python, withGstPlugins ? false, gst_plugins_base ? null
, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
assert withGstPlugins -> gst_plugins_base != null
@@ -7,12 +7,12 @@ assert withGstPlugins -> gst_plugins_base != null
|| gst_plugins_ugly != null
|| gst_plugins_bad != null;
let version = "2.6.3"; in
buildPythonApplication {
let
version = "2.6.3";
inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject dbus-python;
in buildPythonApplication {
# call the package quodlibet and just quodlibet
name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}";
namePrefix = "";
# XXX, tests fail
doCheck = false;
@@ -48,7 +48,7 @@ buildPythonApplication {
];
propagatedBuildInputs = [
mutagen pygtk pygobject pythonDBus gst_python intltool
mutagen pygtk pygobject dbus-python gst_python intltool
];
postInstall = stdenv.lib.optionalString withGstPlugins ''