mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-24 11:39:46 -05:00
gnu: kitty: Update to 0.13.3.
* gnu/packages/terminals.scm (kitty): Update to 0.13.3. [inputs]: Replace python2-pygments with python-pygments. Add wayland. [arguments]: Add 'hard-code-libegl phase.
This commit is contained in:
parent
23c2598233
commit
b412ddcb1a
1 changed files with 14 additions and 3 deletions
|
@ -12,6 +12,7 @@
|
||||||
;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||||
;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com>
|
;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com>
|
||||||
|
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -910,7 +911,7 @@ (define-public tmate
|
||||||
(define-public kitty
|
(define-public kitty
|
||||||
(package
|
(package
|
||||||
(name "kitty")
|
(name "kitty")
|
||||||
(version "0.13.1")
|
(version "0.13.3")
|
||||||
(home-page "https://sw.kovidgoyal.net/kitty/")
|
(home-page "https://sw.kovidgoyal.net/kitty/")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
@ -921,7 +922,7 @@ (define-public kitty
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1j24zjasdh48z7majfpqr71n1wn5a9688wsmmqn26v8kfb68pqs4"))
|
"1y0vd75j8g61jdj8miml79w5ri3pqli5rv9iq6zdrxvzfa4b2rmb"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
|
@ -943,7 +944,8 @@ (define-public kitty
|
||||||
("libpng" ,libpng)
|
("libpng" ,libpng)
|
||||||
("freetype" ,freetype)
|
("freetype" ,freetype)
|
||||||
("fontconfig" ,fontconfig)
|
("fontconfig" ,fontconfig)
|
||||||
("pygments" ,python2-pygments)))
|
("pygments" ,python-pygments)
|
||||||
|
("wayland" ,wayland)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
`(("pkg-config" ,pkg-config)
|
||||||
("libxrandr" ,libxrandr)
|
("libxrandr" ,libxrandr)
|
||||||
|
@ -959,6 +961,15 @@ (define-public kitty
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases (modify-phases %standard-phases
|
'(#:phases (modify-phases %standard-phases
|
||||||
(delete 'configure)
|
(delete 'configure)
|
||||||
|
;; Wayland backend requires EGL, which isn't found
|
||||||
|
;; out-of-the-box for some reason. Hard-code it instead.
|
||||||
|
(add-after 'unpack 'hard-code-libegl
|
||||||
|
(lambda _
|
||||||
|
(let* ((mesa (assoc-ref %build-inputs "libgl1-mesa"))
|
||||||
|
(libegl (string-append mesa "/lib/libEGL.so.1")))
|
||||||
|
(substitute* "glfw/egl_context.c"
|
||||||
|
(("libEGL.so.1") libegl)))
|
||||||
|
#t))
|
||||||
(replace 'build
|
(replace 'build
|
||||||
(lambda _
|
(lambda _
|
||||||
(invoke "python3" "setup.py" "linux-package")))
|
(invoke "python3" "setup.py" "linux-package")))
|
||||||
|
|
Loading…
Reference in a new issue