diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-09-25 02:00:00 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-09-25 02:00:11 +0200 |
| commit | 79b8e52e642ddb6e4abd38535b129f30e0540e0c (patch) | |
| tree | 7afc1f3669cd2aeee0bd10e0a6db8193d5730579 /gnu | |
| parent | 74f07348e99a3495964a8bbb8da83d27ecad656e (diff) | |
| download | guix-79b8e52e642ddb6e4abd38535b129f30e0540e0c.tar.gz guix-79b8e52e642ddb6e4abd38535b129f30e0540e0c.zip | |
Revert "gnu: source-highlight: Fix lesspipe file name and use gexps."
This reverts commit 74f07348e99a3495964a8bbb8da83d27ecad656e.
It is a core-updates change.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/pretty-print.scm | 70 |
1 files changed, 34 insertions, 36 deletions
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 13108fe7db..9745a9ba10 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -32,7 +32,6 @@ #:use-module (guix download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) - #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages bison) @@ -277,41 +276,40 @@ to @code{IOStreams}.") (list boost)) (native-inputs (list bison flex)) - (arguments - (list #:configure-flags - #~(list (string-append "--with-boost=" (assoc-ref %build-inputs "boost"))) - #:parallel-tests? #f ;There appear to be race conditions - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'rename-lesspipe-to-lesspipe.sh.in - (lambda _ - (substitute* "src/src-hilite-lesspipe.sh.in" - (("lesspipe") "lesspipe.sh")))) - #$@(if (%current-target-system) - ;; 'doc/Makefile.am' tries to run stuff even when - ;; cross-compiling. Explicitly skip it. - ;; XXX: Inline this on next rebuild cycle. - #~((add-before 'build 'skip-doc-directory - (lambda _ - (substitute* "Makefile" - (("^SUBDIRS = (.*) doc(.*)$" _ before after) - (string-append "SUBDIRS = " before - " " after "\n")))))) - '()) - (add-before 'check 'patch-test-files - (lambda _ - ;; Unpatch shebangs in test input so that source-highlight - ;; is still able to infer input language - (substitute* '("tests/test.sh" - "tests/test2.sh" - "tests/test.tcl") - (((string-append "#! *" (which "sh"))) "#!/bin/sh")) - ;; Initial patching unrecoverably removes whitespace, so - ;; remove it also in the comparison output. - (substitute* '("tests/test.sh.html" - "tests/test2.sh.html" - "tests/test.tcl.html") - (("#! */bin/sh") "#!/bin/sh"))))))) + (arguments + `(#:configure-flags + (list (string-append "--with-boost=" + (assoc-ref %build-inputs "boost"))) + #:parallel-tests? #f ;There appear to be race conditions + #:phases + (modify-phases %standard-phases + ,@(if (%current-target-system) + ;; 'doc/Makefile.am' tries to run stuff even when + ;; cross-compiling. Explicitly skip it. + ;; XXX: Inline this on next rebuild cycle. + `((add-before 'build 'skip-doc-directory + (lambda _ + (substitute* "Makefile" + (("^SUBDIRS = (.*) doc(.*)$" _ before after) + (string-append "SUBDIRS = " before + " " after "\n"))) + #t))) + '()) + (add-before 'check 'patch-test-files + (lambda _ + ;; Unpatch shebangs in test input so that source-highlight + ;; is still able to infer input language + (substitute* '("tests/test.sh" + "tests/test2.sh" + "tests/test.tcl") + (((string-append "#! *" (which "sh"))) "#!/bin/sh")) + ;; Initial patching unrecoverably removes whitespace, so + ;; remove it also in the comparison output. + (substitute* '("tests/test.sh.html" + "tests/test2.sh.html" + "tests/test.tcl.html") + (("#! */bin/sh") "#!/bin/sh")) + #t))))) (home-page "https://www.gnu.org/software/src-highlite/") (synopsis "Produce a document with syntax highlighting from a source file") (description |