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/cherrytree/default.nix | |
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/misc/cherrytree/default.nix')
-rw-r--r-- | pkgs/applications/misc/cherrytree/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 72049c21b12..4198a9f32b2 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }: +{ stdenv, fetchurl, pythonPackages, gettext, sqlite }: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { [ sqlite3 ]; buildInputs = with pythonPackages; - [ python gettext wrapPython pygtk dbus pygtksourceview ]; + [ python gettext wrapPython pygtk dbus-python pygtksourceview ]; pythonPath = with pythonPackages; - [ pygtk dbus pygtksourceview ]; + [ pygtk dbus-python pygtksourceview ]; patches = [ ./subprocess.patch ]; |