summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/3.20/apps
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/desktops/gnome-3/3.20/apps
parent6b23bd99a31a450fede964206153ddd5ac76a22f (diff)
downloadnixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar
nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.gz
nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.bz2
nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.lz
nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.xz
nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.zst
nixlib-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/desktops/gnome-3/3.20/apps')
-rw-r--r--pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix
index f48feb205790..ea8f15fd4e59 100644
--- a/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-music/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, python3, libxml2, python3Packages, libnotify, wrapGAppsHook
+, libxml2, python3Packages, libnotify, wrapGAppsHook
 , pkgconfig, gtk3, glib, cairo
 , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
 
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
                   gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
-                  python3Packages.pycairo python3Packages.dbus python3Packages.requests2
+                  python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2
                   python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
                   gnome3.gsettings_desktop_schemas makeWrapper tracker ];