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>
This commit is contained in:
parent
065f84d8df
commit
e4abf26a0f
1 changed files with 7 additions and 2 deletions
|
@ -117,7 +117,8 @@
|
||||||
("pygobject" ,python-pygobject)
|
("pygobject" ,python-pygobject)
|
||||||
("urllib3" ,python-urllib3)))
|
("urllib3" ,python-urllib3)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("librsync" ,librsync)
|
`(("dbus" ,dbus) ; dbus-launch (Gio backend)
|
||||||
|
("librsync" ,librsync)
|
||||||
("lftp" ,lftp)
|
("lftp" ,lftp)
|
||||||
("gnupg" ,gnupg) ; gpg executable needed
|
("gnupg" ,gnupg) ; gpg executable needed
|
||||||
("util-linux" ,util-linux))) ; for setsid
|
("util-linux" ,util-linux))) ; for setsid
|
||||||
|
@ -130,7 +131,11 @@
|
||||||
(substitute* "duplicity/gpginterface.py"
|
(substitute* "duplicity/gpginterface.py"
|
||||||
(("self.call = u'gpg'")
|
(("self.call = u'gpg'")
|
||||||
(string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/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"
|
(substitute* '("testing/functional/__init__.py"
|
||||||
"testing/overrides/bin/lftp")
|
"testing/overrides/bin/lftp")
|
||||||
(("/bin/sh") (which "sh")))
|
(("/bin/sh") (which "sh")))
|
||||||
|
|
Reference in a new issue