diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-11-26 11:12:59 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-11-26 11:12:59 -0500 |
| commit | d15ffea6f47a40a9d36f3f32935e63f92e90af03 (patch) | |
| tree | 826b3be17acf0f680e7888b3f7a3eeeaaedded7d /gnu/packages/textutils.scm | |
| parent | 8d2a5a36af4c36dfa08c7ee75d7a06ebb7a8225a (diff) | |
| parent | 176440c056fdde6da98b11720989b1ed060ec97c (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: Ide02272218e76dfae6dc9f8748871c8d61704260
Diffstat (limited to 'gnu/packages/textutils.scm')
| -rw-r--r-- | gnu/packages/textutils.scm | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 41a34b6c4e..ea182b1925 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch> ;;; Copyright © 2023 Reza Housseini <reza@housseini.me> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1129,13 +1130,13 @@ documents into plain text.") "0im3kzvhxkjlx57w6h13mc9584c74ma1dyymgvpq2y61av3gc35v")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no make check - #:make-flags (list "CC=gcc" - (string-append "DESTDIR=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - ;; no configure script - (delete 'configure)))) + (list #:tests? #f ; no make check + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output)) + #:phases + #~(modify-phases %standard-phases + ;; no configure script + (delete 'configure)))) (inputs (list zlib)) (home-page "https://github.com/dstosberg/odt2txt/") @@ -1289,13 +1290,14 @@ Mainland China, Taiwan, and Hong-Kong.") "0anw0knr1iy4p9w3d3b3pbwzh1c43p1i2q4c28kw9zviw8kx2rly")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; test for perl module - #:make-flags (list "CC=gcc" "CFLAGS=-O2 -Wall -pedantic" - (string-append "prefix=" %output) - "MKDIR=mkdir -p") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) ; No ./configure script + (list #:tests? #f ; test for perl module + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "CFLAGS=-O2 -Wall -pedantic" + (string-append "prefix=" #$output) + "MKDIR=mkdir -p") + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; No ./configure script (home-page "https://ja.osdn.net/projects/nkf/") (synopsis "Network Kanji Filter") (description "Nkf is yet another kanji code converter among networks, |