diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-16 22:51:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-16 22:52:37 +0200 |
| commit | 5a501bd828b19e9cef4589b3b9dc2852401a2882 (patch) | |
| tree | 49be7194446f7258b197ff0f29fc00d8eb939f02 /pkgs/applications/audio/quodlibet | |
| parent | 6b23bd99a31a450fede964206153ddd5ac76a22f (diff) | |
| download | nixpkgs-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/applications/audio/quodlibet')
| -rw-r--r-- | pkgs/applications/audio/quodlibet/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 5aaa3195c45..a046fe80e13 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -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 '' |