From 4729cef6bd55dcb3c94b601875c22f86592c9f9c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 8 Sep 2024 02:00:00 +0200
Subject: gnu: aerc: Don't rely on input labels.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mail.scm (aerc)[arguments]: Test for …/bin/zoxide directly.

Change-Id: I6492bd969048a548c45504c0897b851f369277b9
---
 gnu/packages/mail.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 252330415f..52ac86dfbd 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -5086,12 +5086,11 @@ (define-public aerc
                         (string-append
                          "\"" (search-input-file inputs "bin/sh")
                          "\"")))
-                     (when (assoc-ref inputs "zoxide")
-                       (substitute* "commands/z.go"
-                         (("\"zoxide\"")
-                          (string-append
-                           "\"" (search-input-file inputs "bin/zoxide")
-                           "\""))))
+                     (let ((zoxide (search-input-file inputs "bin/zoxide")))
+                       (when zoxide
+                         (substitute* "commands/z.go"
+                           (("\"zoxide\"")
+                            (string-append "\"" zoxide "\"")))))
                      (substitute* (list "lib/crypto/gpg/gpg.go"
                                         "lib/crypto/gpg/gpg_test.go"
                                         "lib/crypto/gpg/gpgbin/keys.go"
-- 
cgit v1.2.3