deja-dup: 45.2 → 46.1

https://gitlab.gnome.org/World/deja-dup/-/compare/45.2...46.beta
https://gitlab.gnome.org/World/deja-dup/-/compare/46.beta...7646f5725ae4500d41e0b18576f317118d04ae66
7646f5725a...46.1

https://gitlab.gnome.org/World/deja-dup/-/releases/46.beta
https://gitlab.gnome.org/World/deja-dup/-/releases/46.0
https://gitlab.gnome.org/World/deja-dup/-/releases/46.1

Upgrading since OneDrive support is broken (duplicity requires requests_oauthlib).
The current version uses duplicity-rclone instead which requires rclone on PATH or it will complain: “rclone not found: please install rclone”
e435874ac9/duplicity/backends/rclonebackend.py (L39)

pkgs/applications/backup/deja-dup/default.nix

@@ -18,18 +18,19 @@
 , libgpg-error
 , json-glib
 , duplicity
+, rclone
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deja-dup";
-  version = "45.2";
+  version = "46.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "deja-dup";
     rev = finalAttrs.version;
-    hash = "sha256-nscswpWX6UB1zuv6TXcT3YE1wkREJYDGQrEPryyUYUM=";
+    hash = "sha256-tKVY0wewBDx0AMzmTdko8vGg5bNGfYohgcSDg5Oky30=";
   };
 
   patches = [
@@ -61,9 +62,17 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   mesonFlags = [
-    "-Dduplicity_command=${duplicity}/bin/duplicity"
+    "-Dduplicity_command=${lib.getExe duplicity}"
+    "-Drclone_command=${lib.getExe rclone}"
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # Required by duplicity
+      --prefix PATH : "${lib.makeBinPath [ rclone ]}"
+    )
+  '';
+
   meta = with lib; {
     description = "Simple backup tool";
     longDescription = ''

pkgs/applications/backup/deja-dup/fix-paths.patch

@@ -1,11 +1,13 @@
 --- a/libdeja/duplicity/DuplicityInstance.vala
 +++ b/libdeja/duplicity/DuplicityInstance.vala
-@@ -114,7 +114,7 @@ internal class DuplicityInstance : Object
+@@ -114,8 +114,8 @@ internal class DuplicityInstance : Object
      // We already are pretty sure we don't have other duplicities in our
      // archive directories, because we use our own and we ensure we only have
      // one deja-dup running at a time via DBus.
--    Posix.system("/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock");
-+    Posix.system("@coreutils@/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock");
+     var lockfile_glob = Shell.quote(cache_dir) + "/*/lockfile.lock";
+-    if (Posix.system("/bin/rm -f " + lockfile_glob) != 0)
++    if (Posix.system("@coreutils@/bin/rm -f " + lockfile_glob) != 0)
+       warning("Could not delete '%s'", lockfile_glob);
  
      Process.spawn_async_with_pipes(null, real_argv, real_envp,
                          SpawnFlags.SEARCH_PATH |