efraim pushed a commit to branch master
in repository guix.

commit e4abf26a0fab51fcd73efc48ae17bebece300cab
Author: Vivien Kraus <[email protected]>
AuthorDate: Thu Oct 14 18:18:56 2021 +0200

    gnu: duplicity: Depend on dbus.
    
    * gnu/packages/backup.scm (duplicity)[inputs]: Add dbus.
    [arguments]: Adjust 'use-store-file-names to substitute the dbus-launch
    program name.
    
    Signed-off-by: Efraim Flashner <[email protected]>
---
 gnu/packages/backup.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 4572ba5..d1e8bc2 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -117,7 +117,8 @@
        ("pygobject" ,python-pygobject)
        ("urllib3" ,python-urllib3)))
     (inputs
-     `(("librsync" ,librsync)
+     `(("dbus" ,dbus)                   ; dbus-launch (Gio backend)
+       ("librsync" ,librsync)
        ("lftp" ,lftp)
        ("gnupg" ,gnupg)                 ; gpg executable needed
        ("util-linux" ,util-linux)))     ; for setsid
@@ -130,7 +131,11 @@
              (substitute* "duplicity/gpginterface.py"
                (("self.call = u'gpg'")
                 (string-append "self.call = '" (assoc-ref inputs "gnupg") 
"/bin/gpg'")))
-
+             (substitute* "duplicity/backends/giobackend.py"
+               (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
+                (string-append "subprocess.Popen([u'"
+                               (assoc-ref inputs "dbus")
+                               "/bin/dbus-launch']")))
              (substitute* '("testing/functional/__init__.py"
                             "testing/overrides/bin/lftp")
                (("/bin/sh") (which "sh")))

Reply via email to