backintime-common: 1.1.24 -> 1.2.1

pkgs/applications/networking/sync/backintime/common.nix

@@ -1,34 +1,40 @@
-{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }:
+{stdenv, lib, fetchFromGitHub, makeWrapper, gettext,
+python3, rsync, cron, openssh, sshfs-fuse, encfs }:
 
 let
-  inherit (python3Packages) python dbus-python keyring;
+  python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]);
-in stdenv.mkDerivation rec {
-  version = "1.1.24";
 
+  apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ];
+in stdenv.mkDerivation rec {
   pname = "backintime-common";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "bit-team";
     repo = "backintime";
     rev = "v${version}";
-    sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18";
+    sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg=";
   };
 
-  buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ];
+  nativeBuildInputs = [ makeWrapper gettext ];
+  buildInputs = [ python' ];
 
   installFlags = [ "DEST=$(out)" ];
 
-  preConfigure = "cd common";
+  preConfigure = ''
+    cd common
+    substituteInPlace configure \
+      --replace "/.." "" \
+      --replace "share/backintime" "${python'.sitePackages}/backintime"
+    substituteInPlace "backintime" \
+      --replace "share" "${python'.sitePackages}"
+  '';
 
   dontAddPrefix = true;
 
-  preFixup =
+  preFixup = ''
-    ''
-    substituteInPlace "$out/bin/backintime" \
-      --replace "=\"/usr/share" "=\"$prefix/share"
     wrapProgram "$out/bin/backintime" \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix PATH : ${apps}
-      --prefix PATH : "$prefix/bin:$PATH"
     '';
 
   meta = {