me/guix
Archived
1
0
Fork 0
Code Activity

gnu: kitty: Update to 0.19.2.

Browse source 
* gnu/packages/terminals.scm (kitty): Update to 0.19.2.
[inputs]: Add lcms.  Switch to python-wrapper.
[arguments]: Merge hard-code-libegl phase in build phase.  Change build
command. Disable checking for updates. Fix error in tests.
This commit is contained in:
Nicolas Goaziou 2020-12-14 18:53:15 +01:00
parent 80ebcdd100
commit 153b279e7b
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gnu/packages/terminals.scm
View file

@ -21,6 +21,7 @@
;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com> ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -64,6 +65,7 @@
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -989,7 +991,7 @@ tmux.")
(define-public kitty (define-public kitty
(package (package
(name "kitty") (name "kitty")
(version "0.16.0") (version "0.19.2")
(home-page "https://sw.kovidgoyal.net/kitty/") (home-page "https://sw.kovidgoyal.net/kitty/")
(source (source
(origin (origin
@ -999,7 +1001,7 @@ tmux.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf")) (base32 "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1015,11 +1017,12 @@ tmux.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("python" ,python) `(("python" ,python-wrapper)
("harfbuzz" ,harfbuzz) ("harfbuzz" ,harfbuzz)
("zlib" ,zlib) ("zlib" ,zlib)
("libcanberra" ,libcanberra) ("libcanberra" ,libcanberra)
("libpng" ,libpng) ("libpng" ,libpng)
("lcms" ,lcms)
("freetype" ,freetype) ("freetype" ,freetype)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("pygments" ,python-pygments) ("pygments" ,python-pygments)
@ -1038,22 +1041,28 @@ tmux.")
("wayland-protocols" ,wayland-protocols))) ("wayland-protocols" ,wayland-protocols)))
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure) ;no configure script
;; 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* (#:key inputs #:allow-other-keys)
(invoke "python3" "setup.py" "linux-package"))) ;; The "kitty" sub-directory must be writable prior to
;; configuration (e.g., un-setting updates).
(for-each make-file-writable (find-files "kitty"))
(invoke "python3" "setup.py" "linux-package"
;; Do not phone home.
"--update-check-interval=0"
;; Wayland backend requires EGL, which isn't
;; found out-of-the-box for some reason.
(string-append "--egl-library="
(assoc-ref inputs "libgl1-mesa")
"/lib/libEGL.so.1"))))
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "python3" "setup.py" "test"))) ;; Fix "cannot find kitty executable" error when running
;; tests.
(setenv "PATH" (string-append "linux-package/bin:"
(getenv "PATH")))
(invoke "python3" "test.py")))
(add-before 'install 'rm-pycache (add-before 'install 'rm-pycache
;; created python cache __pycache__ are non deterministic ;; created python cache __pycache__ are non deterministic
(lambda _ (lambda _