diff mbox series

[bug#51627] gnu: st: Compile and install terminfo files.

Message ID 20211106085334.4778-1-jgart@dismail.de
State Accepted
Headers show
Series [bug#51627] gnu: st: Compile and install terminfo files. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

jgart Nov. 6, 2021, 8:53 a.m. UTC 
* gnu/packages/suckless.scm (st): Compile and install terminfo files.
[native-inputs]: ncurses's tic program is required to compile the
terminfo files.
---
 gnu/packages/suckless.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Comments

Raghav Gururajan Dec. 3, 2021, 8:08 p.m. UTC | #1 
Hi Jorge!

As discussed over XMPP, could you sent a revised patch?

Regards,
RG.
Raghav Gururajan Dec. 3, 2021, 8:37 p.m. UTC | #2 
Pushed to master as 170cb4c881..19528e39bb, with new make-flag. Thanks!

Regards,
RG.
diff mbox series

Patch

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index b4855ec0a2..912ff12422 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -378,6 +378,9 @@  (define-public st
      `(#:tests? #f                      ; no tests
        #:make-flags
        (list (string-append "CC=" ,(cc-for-target))
+             (string-append "TERMINFO="
+                            (assoc-ref %outputs "out")
+                            "/share/terminfo")
              (string-append "PREFIX=" %output))
        #:phases
        (modify-phases %standard-phases
@@ -385,15 +388,20 @@  (define-public st
          (add-after 'unpack 'inhibit-terminfo-install
            (lambda _
              (substitute* "Makefile"
-               (("\ttic .*") ""))
-             #t)))))
+               (("\ttic .*") ""))))
+         (add-after 'install 'compile-and-install-terminfo-entry
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out  (assoc-ref outputs "out"))
+                      (terminfo (string-append out "/share/terminfo")))
+                 (invoke "tic" "-sx" "st.info" "-o" terminfo)))))))
     (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