[bug#67989] [PATCH 0/2] gnu: fzy: Fix cross-compilation

[bug#67989] [PATCH 0/2] gnu: fzy: Fix cross-compilation

[Zheng Junjie]

gnu: fzy: Fix cross-compilation

Zheng Junjie (2):
  gnu: fzy: Use Gexps.
  gnu: fzy: Fix cross-compilation.

 gnu/packages/shellutils.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


base-commit: 2bf5102aacaaf59af537e6d5b5565a0ebea5c267
-- 
2.41.0

[bug#67989] [PATCH 1/2] gnu: fzy: Use Gexps.

[Zheng Junjie]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1447 bytes --]

* gnu/packages/shellutils.scm (fzy)[arguments]: Use Gexps.

Change-Id: Ic9e929ce3e85ec07f44ae7f8597a02a64edd5bf5
---
 gnu/packages/shellutils.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index f010a50538..a5c4f27aa6 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -552,11 +553,12 @@ (define-public fzy
          "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))
+     (list #:make-flags
+           #~(list "CC=gcc"
+                   (string-append "PREFIX=" #$output))
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))))
     (home-page "https://github.com/jhawthorn/fzy")
     (synopsis "Fast fuzzy text selector for the terminal with an advanced
 scoring algorithm")
-- 
2.41.0

[bug#67989] [PATCH 2/2] gnu: fzy: Fix cross-compilation.

[Zheng Junjie]

* gnu/packages/shellutils.scm (fzy)[arguments]: Use cc-for-target.

Change-Id: Ic9e929ce3e85ec07f44ae7f8597a02a64edd5bf5
---
 gnu/packages/shellutils.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index a5c4f27aa6..9993c0b807 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -554,7 +554,7 @@ (define-public fzy
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags
-           #~(list "CC=gcc"
+           #~(list (string-append "CC=" #$(cc-for-target))
                    (string-append "PREFIX=" #$output))
            #:phases
            #~(modify-phases %standard-phases
-- 
2.41.0

bug#67989: [PATCH 2/2] gnu: fzy: Fix cross-compilation.

[Mathieu Othacehe]

Applied the series,

Thanks,

Mathieu