From e4abf26a0fab51fcd73efc48ae17bebece300cab Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Thu, 14 Oct 2021 18:18:56 +0200
Subject: 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 <efraim@flashner.co.il>
---
 gnu/packages/backup.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 4572ba56e7..d1e8bc2d37 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")))
-- 
cgit v1.2.3

='/guix/log/gnu/installer/substitutes.scm'>
<input type='hidden' name='id' value='78b3727b6030715aef69a999f97a5d8e673a89db'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=78b3727b6030715aef69a999f97a5d8e673a89db'>root</a>/<a href='/guix/log/gnu?id=78b3727b6030715aef69a999f97a5d8e673a89db'>gnu</a>/<a href='/guix/log/gnu/installer?id=78b3727b6030715aef69a999f97a5d8e673a89db'>installer</a>/<a href='/guix/log/gnu/installer/substitutes.scm?id=78b3727b6030715aef69a999f97a5d8e673a89db'>substitutes.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/substitutes.scm?id=78b3727b6030715aef69a999f97a5d8e673a89db&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-11 21:37:07 +0100'>2020-12-11</span></td><td><a href='/guix/commit/gnu/installer/substitutes.scm?id=8361817bf693742757b096468198626f297bb09e'>install: Discover local substitute servers.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/substitutes.scm: New file.
* gnu/installer/newt/substitutes.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add them.
* po/guix/POTFILES.in: Add gnu/installer/newt/substitutes.scm.
* gnu/installer/proxy.scm (with-silent-shepherd): Move to ...
* gnu/installer/utils.scm: ... here.
* gnu/installer/record.scm (&lt;installer&gt;)[substitutes-page]: New field.
* gnu/installer/newt.scm (substitutes-page): New procedure,
(newt-installer): register it.
* gnu/installer.scm (installer-steps): Add "substitutes-page" step.
* gnu/system/install.scm (%installation-services): Add avahi-service-type and
enable substitute server discover in guix-service-type.
[&lt;name-service-switch&gt;]: Set it to %mdns-host-lookup-nss.
</span></span></td><td>Mathieu Othacehe</td></tr>