diff mbox series

[bug#51627,v2] gnu: st: Install terminfo files.

Message ID 20211203202133.12732-1-jgart@dismail.de
State Accepted
Headers show
Series [bug#51627,v2] gnu: st: Install terminfo files. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

jgart Dec. 3, 2021, 8:21 p.m. UTC 
Here is version two of the patch set that adds ncurses to the native-input.

The Makefile already takes care of compiling the terminfo files as long as the
tic binary is available. The tic binary comes from the ncurse package.

* gnu/packages/suckless.scm (st)[native-inputs]: Add ncurses.
[configure-flags](TERMINFO): New flag.
[phases](inhibit-terminfo-install): Remove phase.
---
 gnu/packages/suckless.scm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index b4855ec0a2..fcebe894a7 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -378,22 +378,15 @@  (define-public st
      `(#:tests? #f                      ; no tests
        #:make-flags
        (list (string-append "CC=" ,(cc-for-target))
-             (string-append "PREFIX=" %output))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'unpack 'inhibit-terminfo-install
-           (lambda _
-             (substitute* "Makefile"
-               (("\ttic .*") ""))
-             #t)))))
+             (string-append "PREFIX=" %output))))
     (inputs
      `(("libx11" ,libx11)
        ("libxft" ,libxft)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("ncurses" ,ncurses)
+       ("pkg-config" ,pkg-config)))
     (home-page "https://st.suckless.org/")
     (synopsis "Simple terminal emulator")
     (description