diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-03-31 20:46:45 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-03-31 20:46:45 -0400 |
| commit | 155f23a52e626e8ac60f818937d5bb1a3ebe3184 (patch) | |
| tree | a19317812471db31ae2a97844d6cf74e45057466 /gnu/packages/zig-xyz.scm | |
| parent | d9dee5ea2f564fa6979ae552fd9bd5ac22f86ecc (diff) | |
| parent | 1cba1f8ce6f84c4737650401c0eb0473a45f9ff7 (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: I4cd94a58b62d8c3987e4a60c76b37894ad851e35
Diffstat (limited to 'gnu/packages/zig-xyz.scm')
| -rw-r--r-- | gnu/packages/zig-xyz.scm | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 200b5c9940..0cd08b6ac6 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2022 Maya Tomasek <maya.tomasek@disroot.org> ;;; Copyright © 2023 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> +;;; Copyright © 2024 Justin Veilleux <terramorpha@cock.li> ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +53,17 @@ (build-system zig-build-system) (arguments (list - #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-wayland-session + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (wayland-sessions + (string-append out "/share/wayland-sessions"))) + (mkdir-p wayland-sessions) + (install-file "contrib/river.desktop" + wayland-sessions))))) + #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support #:zig-release-type "safe")) (native-inputs (list libevdev libxkbcommon @@ -61,7 +72,7 @@ scdoc wayland wayland-protocols - wlroots)) + wlroots-0.16)) (home-page "https://github.com/riverwm/river") (synopsis "Dynamic tiling Wayland compositor") (description @@ -97,7 +108,7 @@ mission-critical safety and performance for financial services.") (define-public zig-zls (package (name "zig-zls") - (version "0.9.0") + (version "0.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -107,24 +118,12 @@ mission-critical safety and performance for financial services.") (file-name (git-file-name name version)) (sha256 (base32 - "1hhs7dz9rpshfd1a7x5swmix2rmh53vsqskh3mzqlrj2lgb3cnii")))) - (build-system gnu-build-system) - (inputs (list zig-0.9 python)) + "1lsks7h3z2m4psyn9mwdylv1d6a9i3z54ssadiz76w0clbh8ch9k")))) + (build-system zig-build-system) + (inputs (list zig-0.10 python)) (arguments - (list #:phases #~(modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")) - (invoke "zig" "build" "install" - "-Drelease-safe" "--prefix" out)))) - (delete 'install) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "zig" "build" "test"))))))) + ;; The tests fail with memory leaks. + (list #:tests? #f)) (synopsis "Zig language server") (description "Zig Language Server is a language server implementing the @acronym{LSP, |