1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-09 18:55:55 +02:00

gnu: xwayland-satellite: Update to 0.8.1.

* gnu/packages/xorg.scm (xwayland-satellite): Update to 0.8.1.
[source]: Remove bundled OpenSans-Regular.ttf.
[inputs]: Add fontconfig.
[arguments] <#:features>: Enable its feature.
<#:phases>: Set package version.
Install man page.
* gnu/packages/rust-crates.scm (lookup-cargo-inputs) [xwayland-satellite]:
Update entry.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Hilton Chain
2026-04-18 12:29:03 +08:00
committed by Efraim Flashner
parent 5003dc6bac
commit 2dde6fc80f
2 changed files with 98 additions and 60 deletions
+80 -57
View File
@@ -10123,6 +10123,10 @@
(crate-source "font-types" "0.11.0"
"08ss73lzqv61yqmswc5sw7rbyx27r3gamjcxrhq89lvrrz8d5r5i"))
(define rust-fontconfig-0.10.0
(crate-source "fontconfig" "0.10.0"
"17s2a8gbykgy0cgn6nr0wcg4sd4rwslh6d1yzcxs4pkhik54p75i"))
(define rust-fontconfig-parser-0.5.8
(crate-source "fontconfig-parser" "0.5.8"
"0ijnbzg31sl6v49g7q2l7sl76hjj8z0hvlsz77cdvm029vi77ixv"))
@@ -36538,6 +36542,10 @@
(crate-source "wayland-server" "0.31.10"
"08k23abw3vav8f71x6s5m70mc0zgq22a9ljs8iqbm7vcp8x4zggw"))
(define rust-wayland-server-0.31.13
(crate-source "wayland-server" "0.31.13"
"1800f2fg41p28q9ddhdv21b78aqahcm9w2aa9zh854f40kmlc66c"))
(define rust-wayland-server-0.31.9
(crate-source "wayland-server" "0.31.9"
"11apclvwsp43l24gvdlrg455b7pr2nnfcd2xc8s0vahdry6gnpa8"))
@@ -38348,6 +38356,10 @@
(crate-source "xcb" "1.6.0"
"1sipp903dbcbqx9b55dshwiyacp112plwr9yc3hbyfb1g4xi4z7h"))
(define rust-xcb-1.7.0
(crate-source "xcb" "1.7.0"
"1xhcjybdm0q5672zjqrjdidl4kk6plkykdsfryjv1aq5h86mhk7f"))
(define rust-xcb-imdkit-0.3.0.212330f
(origin
(method git-fetch)
@@ -38364,6 +38376,10 @@
(crate-source "xcb-util-cursor" "0.3.5"
"0fa2w4d6lspapc1c9iwvfl5cyg5x4581fqb02m4xlphz3b2ifr5z"))
(define rust-xcb-util-cursor-0.4.0
(crate-source "xcb-util-cursor" "0.4.0"
"0i2ppjkz66mbj9xrpalpviil784qrxzw2bkmxnxrwy76f01d2mn2"))
(define rust-xcb-util-cursor-sys-0.1.4
(crate-source "xcb-util-cursor-sys" "0.1.4"
"00d67fxdzvym65ln988a8x3aakg8bb0drki2bv4ac8s7avrmyrz2"))
@@ -38372,6 +38388,10 @@
(crate-source "xcb-util-cursor-sys" "0.1.6"
"0iyb42rqky8jlcvql1rsiz5kxwjphjc4rrprcbp8fxk466qsqy2c"))
(define rust-xcb-util-cursor-sys-0.2.0
(crate-source "xcb-util-cursor-sys" "0.2.0"
"1dlq7k065xzmsflryljg2pl381mx6pz1yhskbij3hsybsp5gcil3"))
(define rust-xcursor-0.3.10
(crate-source "xcursor" "0.3.10"
"0awgy98awg4ydcfmynqfcwvl4bnnfcm4i2vvnk2n926a02jy9jdy"))
@@ -98598,14 +98618,14 @@
rust-ahash-0.8.12
rust-aho-corasick-1.1.4
rust-allocator-api2-0.2.21
rust-anyhow-1.0.100
rust-anyhow-1.0.102
rust-arrayref-0.3.9
rust-arrayvec-0.7.6
rust-bindgen-0.72.1
rust-bitflags-1.3.2
rust-bitflags-2.10.0
rust-bytemuck-1.24.0
rust-cc-1.2.48
rust-bitflags-2.11.1
rust-bytemuck-1.25.0
rust-cc-1.2.60
rust-cexpr-0.6.0
rust-cfg-if-1.0.4
rust-clang-sys-1.8.1
@@ -98614,117 +98634,120 @@
rust-darling-0.20.11
rust-darling-core-0.20.11
rust-darling-macro-0.20.11
rust-deranged-0.5.5
rust-deranged-0.5.8
rust-derive-builder-0.20.2
rust-derive-builder-core-0.20.2
rust-derive-builder-macro-0.20.2
rust-dlib-0.5.3
rust-downcast-rs-1.2.1
rust-either-1.15.0
rust-env-logger-0.10.2
rust-equivalent-1.0.2
rust-errno-0.3.14
rust-fdeflate-0.3.7
rust-find-msvc-tools-0.1.5
rust-flate2-1.1.5
rust-find-msvc-tools-0.1.9
rust-flate2-1.1.9
rust-fnv-1.0.7
rust-foldhash-0.1.5
rust-fontconfig-0.10.0
rust-fontdue-0.9.3
rust-glob-0.3.3
rust-hashbrown-0.14.5
rust-hashbrown-0.15.5
rust-hashbrown-0.16.1
rust-hashbrown-0.17.0
rust-hecs-0.10.5
rust-hecs-macros-0.10.0
rust-hermit-abi-0.5.2
rust-humantime-2.3.0
rust-ident-case-1.0.1
rust-indexmap-2.12.1
rust-indexmap-2.14.0
rust-is-terminal-0.4.17
rust-itertools-0.13.0
rust-itoa-1.0.15
rust-libc-0.2.177
rust-itoa-1.0.18
rust-libc-0.2.185
rust-libloading-0.8.9
rust-linux-raw-sys-0.11.0
rust-log-0.4.28
rust-memchr-2.7.6
rust-memmap2-0.9.9
rust-linux-raw-sys-0.12.1
rust-log-0.4.29
rust-memchr-2.8.0
rust-memmap2-0.9.10
rust-minimal-lexical-0.2.1
rust-miniz-oxide-0.8.9
rust-nom-7.1.3
rust-num-conv-0.1.0
rust-num-enum-0.7.5
rust-num-enum-derive-0.7.5
rust-num-conv-0.2.1
rust-num-enum-0.7.6
rust-num-enum-derive-0.7.6
rust-num-threads-0.1.7
rust-once-cell-1.21.3
rust-once-cell-1.21.4
rust-owned-ttf-parser-0.25.1
rust-pkg-config-0.3.32
rust-pkg-config-0.3.33
rust-png-0.17.16
rust-powerfmt-0.2.0
rust-pretty-env-logger-0.5.0
rust-prettyplease-0.2.37
rust-proc-macro-crate-3.4.0
rust-proc-macro2-1.0.103
rust-proc-macro-crate-3.5.0
rust-proc-macro2-1.0.106
rust-quick-xml-0.30.0
rust-quick-xml-0.37.5
rust-quote-1.0.42
rust-regex-1.12.2
rust-regex-automata-0.4.13
rust-regex-syntax-0.8.8
rust-rustc-hash-2.1.1
rust-rustix-1.1.2
rust-quick-xml-0.39.2
rust-quote-1.0.45
rust-regex-1.12.3
rust-regex-automata-0.4.14
rust-regex-syntax-0.8.10
rust-rustc-hash-2.1.2
rust-rustix-1.1.4
rust-rustversion-1.0.22
rust-sd-notify-0.4.5
rust-serde-1.0.228
rust-serde-core-1.0.228
rust-serde-derive-1.0.228
rust-shlex-1.3.0
rust-simd-adler32-0.3.7
rust-simd-adler32-0.3.9
rust-smallvec-1.15.1
rust-smithay-client-toolkit-0.20.0
rust-spin-0.9.8
rust-strict-num-0.1.1
rust-strsim-0.11.1
rust-syn-2.0.111
rust-syn-2.0.117
rust-termcolor-1.4.1
rust-thiserror-2.0.17
rust-thiserror-impl-2.0.17
rust-time-0.3.44
rust-time-core-0.1.6
rust-time-macros-0.2.24
rust-thiserror-2.0.18
rust-thiserror-impl-2.0.18
rust-time-0.3.47
rust-time-core-0.1.8
rust-time-macros-0.2.27
rust-tiny-skia-0.11.4
rust-tiny-skia-path-0.11.4
rust-toml-datetime-0.7.3
rust-toml-edit-0.23.7
rust-toml-parser-1.0.4
rust-toml-datetime-1.1.1+spec-1.1.0
rust-toml-edit-0.25.11+spec-1.1.0
rust-toml-parser-1.1.2+spec-1.1.0
rust-ttf-parser-0.21.1
rust-ttf-parser-0.25.1
rust-unicode-ident-1.0.22
rust-vergen-9.0.6
rust-unicode-ident-1.0.24
rust-vergen-9.1.0
rust-vergen-gitcl-1.0.8
rust-vergen-lib-0.1.6
rust-vergen-lib-9.1.0
rust-version-check-0.9.5
rust-wayland-backend-0.3.11
rust-wayland-client-0.31.11
rust-wayland-backend-0.3.15
rust-wayland-client-0.31.14
rust-wayland-csd-frame-0.3.0
rust-wayland-cursor-0.31.11
rust-wayland-protocols-0.32.9
rust-wayland-cursor-0.31.14
rust-wayland-protocols-0.32.12
rust-wayland-protocols-experimental-20250721.0.1
rust-wayland-protocols-misc-0.3.9
rust-wayland-protocols-wlr-0.3.9
rust-wayland-scanner-0.31.7
rust-wayland-server-0.31.10
rust-wayland-sys-0.31.7
rust-wayland-protocols-misc-0.3.12
rust-wayland-protocols-wlr-0.3.12
rust-wayland-scanner-0.31.10
rust-wayland-server-0.31.13
rust-wayland-sys-0.31.11
rust-winapi-util-0.1.11
rust-windows-link-0.2.1
rust-windows-sys-0.61.2
rust-winnow-0.7.14
rust-xcb-1.6.0
rust-xcb-util-cursor-0.3.5
rust-xcb-util-cursor-sys-0.1.6
rust-winnow-1.0.1
rust-xcb-1.7.0
rust-xcb-util-cursor-0.4.0
rust-xcb-util-cursor-sys-0.2.0
rust-xcursor-0.3.10
rust-xkeysym-0.2.1
rust-zerocopy-0.8.31
rust-zerocopy-derive-0.8.31))
rust-yeslogic-fontconfig-sys-6.0.0
rust-zerocopy-0.8.48
rust-zerocopy-derive-0.8.48))
(yabridgectl =>
(list rust-anstream-0.6.21
rust-anstyle-1.0.13
+18 -3
View File
@@ -7189,7 +7189,7 @@ direct replacement for @command{xvfb-run} specifically.
(define-public xwayland-satellite
(package
(name "xwayland-satellite")
(version "0.8")
(version "0.8.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7198,12 +7198,15 @@ direct replacement for @command{xvfb-run} specifically.
(file-name (git-file-name name version))
(sha256
(base32
"10m99vjms9wbx9p9qcq7sjcspxllmp82ddyiw4rpmhjscyy5cga3"))))
"0w1ihmr20ayqc72qwc4sq4gsrikzwdrmag3mmgin686bg3a3hh85"))
(modules '((guix build utils)))
(snippet '(delete-file "OpenSans-Regular.ttf"))))
(build-system cargo-build-system)
(arguments
(list #:install-source? #f
#:tests? #f ;Requires running display server.
#:cargo-install-paths ''(".")
#:features ''("fontconfig")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
@@ -7211,10 +7214,22 @@ direct replacement for @command{xvfb-run} specifically.
(substitute* "src/lib.rs"
(("\"Xwayland\"")
(format #f "~s"
(search-input-file inputs "bin/Xwayland")))))))))
(search-input-file inputs "bin/Xwayland"))))))
(add-after 'unpack 'set-version
(lambda _
(setenv "VERGEN_GIT_DESCRIBE"
#$(package-version this-package))))
(add-after 'install 'install-manpage
(lambda _
(let ((src "xwayland-satellite.man")
(dst (in-vicinity
#$output "share/man/man1/xwayland-satellite.1")))
(mkdir-p (dirname dst))
(copy-file src dst)))))))
(native-inputs (list pkg-config))
(inputs
(cons* clang
fontconfig
xcb-util-cursor
xorg-server-xwayland
(cargo-inputs 'xwayland-satellite)))