ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: source-highlight: Fix lesspipe file name and use gexps.

Browse source 
This fixes src-hilite-lesspipe.sh so that lesspipe.sh is called instead of lesspipe.

* gnu/packages/pretty-print.scm (source-highlight):
[arguments]: Use gexps, remove trailing #ts.
[phases]: Add phase to make src-highlight-lesspipe.sh work.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
This commit is contained in:
kiasoc5 2022-09-19 02:57:30 -04:00 committed by Tobias Geerinckx-Rice
parent 4d0befe66a
commit 91db77c955
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/pretty-print.scm
View file

@ -32,6 +32,7 @@ (define-module (gnu packages pretty-print)
#: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)
@ -278,23 +279,25 @@ (define-public source-highlight
(native-inputs
(list bison flex))
(arguments
`(#:configure-flags
(list (string-append "--with-boost="
(assoc-ref %build-inputs "boost")))
(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
,@(if (%current-target-system)
#~(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
#~((add-before 'build 'skip-doc-directory
(lambda _
(substitute* "Makefile"
(("^SUBDIRS = (.*) doc(.*)$" _ before after)
(string-append "SUBDIRS = " before
" " after "\n")))
#t)))
" " after "\n"))))))
'())
(add-before 'check 'patch-test-files
(lambda _
@ -309,8 +312,7 @@ (define-public source-highlight
(substitute* '("tests/test.sh.html"
"tests/test2.sh.html"
"tests/test.tcl.html")
(("#! */bin/sh") "#!/bin/sh"))
#t)))))
(("#! */bin/sh") "#!/bin/sh")))))))
(home-page "https://www.gnu.org/software/src-highlite/")
(synopsis "Produce a document with syntax highlighting from a source file")
(description