Subject: [bug#56872] [PATCH v2] gnu: mu: Update to 1.8.7.

From: muradm <[email-masked]>
Date: Tue, 02 Aug 2022 22:03:06 +0300

Hi,

This patch worked for me in my host.
I don't have any environment to see if working when
actually cross-compiling.

For the comment on coreutils, yeah missed update when removed.

From b688acbb5b9d6d65606edf2164cad09c9cf06225 Mon Sep 17 00:00:00 2001
From: muradm <[email-masked]>
Date: Tue, 2 Aug 2022 21:57:57 +0300
Subject: [PATCH] gnu: mu: Fix cross-compiling.
To: Maxime Devos <[email-masked]>,
    [email-masked]

* gnu/packages/mail.scm (mu)[arguments]: Use search-input-file
to find /bin/sh and /bin/rm from inputs.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ca4b3e819e..3776157c0b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1189,15 +1189,15 @@ (define-public mu
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-bin-references
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              (substitute* '("guile/tests/test-mu-guile.cc"
                             "mu/tests/test-mu-cmd.cc"
                             "mu/tests/test-mu-cmd-cfind.cc"
                             "mu/tests/test-mu-query.cc")
-               (("/bin/sh") (which "sh")))
+               (("/bin/sh") (search-input-file inputs "/bin/sh")))
              (substitute* '("lib/tests/bench-indexer.cc"
                             "lib/utils/mu-utils.cc")
-               (("/bin/rm") (which "rm")))))
+               (("/bin/rm") (search-input-file inputs "/bin/rm")))))
          (add-after 'install 'install-emacs-autoloads
            (lambda* (#:key outputs #:allow-other-keys)
              (emacs-generate-autoloads
-- 
2.37.1

Maxime Devos <[email-masked]> writes:

> [[PGP Signed Part:Undecided]]
>
> On 01-08-2022 15:41, muradm wrote:
>> +             (substitute* '("lib/utils/mu-utils.cc"
>> +                            "lib/tests/bench-indexer.cc")
>> +               (("/bin/rm") (which "rm")))))
>
> The lib/utils/mu-utils.cc + 'which' looks wrong when 
> cross-compiling
> -- try using search-input-file on 'inputs' instead (which looks 
> in
> native-inputs (which happens to be merged with inputs when 
> compiling
> natively))).
>
> (If it does not end up in the binary, then 'which' should be 
> fine)
>
>> [inputs]: Removed guile added coreutils (for /bin/rm command).
> I'm not seeing coreutils in there.
>
> Greetings,
> Maxime
>
> [2. OpenPGP public key --- application/pgp-keys; 
> OpenPGP_0x49E3EE22191725EE.asc]...
>
> [[End of PGP Signed Part]]