diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-06-19 02:00:00 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-07-17 02:00:11 +0200 |
| commit | 479d9ea0c2498e6dca1bd3790da8fca4acb83018 (patch) | |
| tree | 5b2952e917263e51f24a5c96cca018b5841cb413 /gnu | |
| parent | 3928f69d0017d66f4676846b2bade1378f5ac560 (diff) | |
| download | guix-patches-479d9ea0c2498e6dca1bd3790da8fca4acb83018.tar guix-patches-479d9ea0c2498e6dca1bd3790da8fca4acb83018.tar.gz | |
gnu: slang: Update code style.
* gnu/packages/slang.scm (slang)[source]: Turn the snippet into a
G-expression and remove the trailing #t.
[arguments]: Use G-expressions. Use 'fix-configure-script phase
from most.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/slang.scm | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index 90945dd7c3..f335dc1a39 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -48,31 +48,29 @@ "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "src/Makefile.in" - (("/bin/ln") "ln")) - #t)))) + #~(begin + (substitute* "src/Makefile.in" + (("/bin/ln") "ln")))))) (build-system gnu-build-system) (arguments - '(#:parallel-tests? #f - #:parallel-build? #f ; there's at least one race - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'reduce-array-test-size - ;; Reduce the size of the array, otherwise the array.sl/array.slc - ;; tests fails with "Unable to create a multi-dimensional array of - ;; the desired size" on 32 bit systems. - (lambda _ - (substitute* "src/test/array.sl" - (("10000,10000,10000,10000,10000,10000") - "10,10,10,10,10,10")))) - (add-before 'configure 'substitute-before-config - (lambda* (#:key inputs #:allow-other-keys) - (let ((ncurses (assoc-ref inputs "ncurses"))) - (substitute* "configure" - (("MISC_TERMINFO_DIRS=\"\"") - (string-append "MISC_TERMINFO_DIRS=" - "\"" ncurses "/share/terminfo" "\""))))))))) + (list #:parallel-tests? #f + #:parallel-build? #f ; race to build/use elfobj + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'reduce-array-test-size + ;; Fix array.sl/array.slc failure on 32-bit systems ("Unable to + ;; to create a multi-dimensional array of the desired size"). + (lambda _ + (substitute* "src/test/array.sl" + (("10000,10000,10000,10000,10000,10000") + "10,10,10,10,10,10")))) + (add-before 'configure 'fix-configure-script + ;; Don't try to link to the long-obsolete (and gone) -ltermcap. + (lambda _ + (substitute* "configure" + (("(MISC_TERMINFO_DIRS)=.*" _ variable) + (format #f "~a=\"~a/share/terminfo\"\n" variable + #$(this-package-input "ncurses"))))))))) (inputs (list readline zlib libpng pcre ncurses)) (home-page "https://www.jedsoft.org/slang/") |