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/misc/batti | |
| parent | 6b23bd99a31a450fede964206153ddd5ac76a22f (diff) | |
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/misc/batti')
| -rw-r--r-- | pkgs/applications/misc/batti/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index a2b3c15f0444..14416c24d23e 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl -, pkgconfig, gettext, python -, gtk, pygtk, dbus_python -, gdk_pixbuf, upower +, pkgconfig, gettext, pythonPackages +, gtk, gdk_pixbuf, upower , makeWrapper }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) dbus-python pygtk python; +in stdenv.mkDerivation rec { name = "batti-${version}"; version = "0.3.8"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig gettext python gtk pygtk dbus_python gdk_pixbuf upower makeWrapper ]; + [ pkgconfig gettext python gtk pygtk dbus-python gdk_pixbuf upower makeWrapper ]; configurePhase = "true"; |