diff options
Diffstat (limited to 'gnu/packages/wm.scm')
| -rw-r--r-- | gnu/packages/wm.scm | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 51aae91f88..82b7db7f87 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1928,7 +1928,7 @@ limited size and a few external dependencies. It is configurable via (define-public niri (package (name "niri") - (version "25.05.1") + (version "25.08") (source (origin (method git-fetch) (uri (git-reference @@ -1937,10 +1937,14 @@ limited size and a few external dependencies. It is configurable via (file-name (git-file-name name version)) (sha256 (base32 - "0l0nj2zfmdyr058yc84579jxj6m4lilgcy63dna6bp6mv7xl569h")))) + "09nsxd211mly8r1ys2lq6ia4jxgb980h1axrbgw748r0knfbbj7n")))) (build-system cargo-build-system) (arguments (list #:install-source? #f + #:modules + '((ice-9 match) + (guix build utils) + (guix build cargo-build-system)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'use-guix-vendored-dependencies @@ -1962,6 +1966,7 @@ limited size and a few external dependencies. It is configurable via (setenv "NIRI_BUILD_VERSION_STRING" #$(package-version this-package)) ;; For tests. + (setenv "RAYON_NUM_THREADS" "1") (setenv "XDG_RUNTIME_DIR" "/tmp"))) (add-after 'install 'install-extras (lambda* (#:key inputs #:allow-other-keys) @@ -1976,9 +1981,31 @@ limited size and a few external dependencies. It is configurable via (in-vicinity #$output "share/wayland-sessions")) (install-file "resources/niri-portals.conf" - (in-vicinity #$output "share/xdg-desktop-portal"))))))) + (in-vicinity #$output "share/xdg-desktop-portal")))) + (add-after 'install 'install-completions + (lambda* (#:key native-inputs #:allow-other-keys) + (for-each + (match-lambda + ((shell . path) + (mkdir-p (in-vicinity #$output (dirname path))) + (let ((binary + (if #$(%current-target-system) + (search-input-file native-inputs "bin/niri") + (in-vicinity #$output "bin/niri")))) + (with-output-to-file (in-vicinity #$output path) + (lambda _ + (invoke binary "completions" shell)))))) + '(("bash" . "share/bash-completion/completions/niri") + ("elvish" . "share/elvish/lib/niri") + ("fish" . "share/fish/vendor_completions.d/niri.fish") + ("nushell" . "share/nushell/vendor/autoload/niri") + ("zsh" . "share/zsh/site-functions/_niri")))))))) (native-inputs - (list pkg-config)) + (append + (if (%current-target-system) + (list this-package) + '()) + (list pkg-config))) (inputs (cons* clang dbus |