branch core-updates updated: gnu: perl: Use ‘search-input-file’ to find ‘bin/pwd’

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 52cc639  gnu: perl: Use ‘search-input-file’ to find ‘bin/pwd’
52cc639 is described below

commit 52cc6394033546406b81c146d38104c1d80dc68f
Author: Thiago Jung Bauermann <bauermann@kolabnow.com>
AuthorDate: Sat Jul 24 22:58:26 2021 -0300

    gnu: perl: Use ‘search-input-file’ to find ‘bin/pwd’
    
    A recent change makes the ‘perl’ package explicitly reference input
    “coreutils” or “coreutils-minimal” by label in the ‘setup-configure’ phase
    but the ‘perl-boot0’ package, which uses ‘%boot0-inputs’ as its input list,
    doesn’t have such input on non-x86-linux systems. This causes the build of
    ‘perl-boot0’ to fail on those systems.
    
    Therefore use ‘search-input-file’ to find ‘bin/pwd’ and avoid referencing
    the input label.
    
    * gnu/packages/perl.scm (perl)[arguments]<#:phases>: Use
    ‘search-input-file’ to find ‘bin/pwd’.
    
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/perl.scm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 040898b..99a152e 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -124,18 +124,16 @@
        (modify-phases %standard-phases
          (add-before 'configure 'setup-configure
            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((coreutils (or (assoc-ref inputs "coreutils-minimal")
-                                  (assoc-ref inputs "coreutils"))))
-               ;; Use the right path for `pwd'.
-               (substitute* "dist/PathTools/Cwd.pm"
-                 (("'/bin/pwd'")
-                  (string-append "'" coreutils "/bin/pwd'")))
-
-               ;; Build in GNU89 mode to tolerate C++-style comment in libc's
-               ;; <bits/string3.h>.
-               (substitute* "cflags.SH"
-                 (("-std=c89")
-                  "-std=gnu89")))))
+             ;; Use the right path for `pwd'.
+             (substitute* "dist/PathTools/Cwd.pm"
+               (("'/bin/pwd'")
+                (string-append "'" (search-input-file inputs "bin/pwd") "'")))
+
+             ;; Build in GNU89 mode to tolerate C++-style comment in libc's
+             ;; <bits/string3.h>.
+             (substitute* "cflags.SH"
+               (("-std=c89")
+                "-std=gnu89"))))
          ,@(if (%current-target-system)
                `((add-after 'unpack 'unpack-cross
                    (lambda* (#:key native-inputs inputs #:allow-other-keys)