about summary refs log tree commit diff
path: root/pkgs/applications/networking/sync/backintime
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/applications/networking/sync/backintime
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/applications/networking/sync/backintime')
-rw-r--r--pkgs/applications/networking/sync/backintime/common.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index c3f8e0f02c66..c1907c44e584 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -1,6 +1,8 @@
-{stdenv, fetchFromGitHub, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
+{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (python3Packages) python dbus-python keyring;
+in stdenv.mkDerivation rec {
   version = "1.1.12";
 
   name = "backintime-common-${version}";
@@ -12,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a";
   };
 
-  buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ];
+  buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfsFuse encfs ];
 
   installFlags = [ "DEST=$(out)" ];