guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/14: gnu: duplicity: Use ‘search-input-file’.


From: guix-commits
Subject: 10/14: gnu: duplicity: Use ‘search-input-file’.
Date: Wed, 22 Nov 2023 10:52:44 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit ad40a5d0e23fd038780ee87ceb4b4363c575f018
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Nov 22 16:15:16 2023 +0100

    gnu: duplicity: Use ‘search-input-file’.
    
    * gnu/packages/backup.scm (duplicity)[arguments]: In
    ‘use-store-file-names’ phase, use ‘search-input-file’.
    
    Change-Id: I4b66a22283fc6e426377ad9f4f4c451598eb74e0
---
 gnu/packages/backup.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index f10c7914d5..5aa0d5688f 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -146,12 +146,14 @@
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "duplicity/gpginterface.py"
                (("self.call = u'gpg'")
-                (string-append "self.call = '" (assoc-ref inputs "gnupg") 
"/bin/gpg'")))
+                (string-append "self.call = '"
+                               (search-input-file inputs "/bin/gpg")
+                               "'")))
              (substitute* "duplicity/backends/giobackend.py"
                (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
                 (string-append "subprocess.Popen([u'"
-                               (assoc-ref inputs "dbus")
-                               "/bin/dbus-launch']")))
+                               (search-input-file inputs "/bin/dbus-launch")
+                               "']")))
              (substitute* '("testing/functional/__init__.py"
                             "testing/overrides/bin/lftp")
                (("/bin/sh") (which "sh")))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]