mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 11:29:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xf86-input-keyboard: Remove Linux from supported systems.

Browse source 
* gnu/packages/xorg.scm (xf86-input-keyboard)[supported-systems]: New field.
(xpra)[inputs]: Remove xf86-input-keyboard.
* gnu/services/xorg.scm (%default-xorg-modules): Remove xf86-input-keyboard.
* doc/guix.texi (X Window)[%default-xorg-modules]: Replace xf86-input-keyboard
with xf86-input-libinput.

Change-Id: Ia0b5c0289aa83e3afa7e71bef1785d6bddf6f017
This commit is contained in:
宋文武 2025-01-22 09:37:07 +08:00
parent 5eb37a9b36
commit 510ed97450
No known key found for this signature in database
GPG key ID: D415BF253B515976
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -24104,7 +24104,7 @@ SLiM@. Thus, the configuration of these display managers aggregates an
@table @asis @table @asis
@item @code{modules} (default: @code{%default-xorg-modules}) @item @code{modules} (default: @code{%default-xorg-modules})
This is a list of @dfn{module packages} loaded by the Xorg This is a list of @dfn{module packages} loaded by the Xorg
server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so on. server---e.g., @code{xf86-video-vesa}, @code{xf86-input-libinput}, and so on.
@item @code{fonts} (default: @code{%default-xorg-fonts}) @item @code{fonts} (default: @code{%default-xorg-fonts})
This is a list of font directories to add to the server's @dfn{font path}. This is a list of font directories to add to the server's @dfn{font path}.

4
gnu/packages/xorg.scm
View file

@ -2620,6 +2620,8 @@ It is used to control the pointer with a joystick device.")
(base32 (base32
"0mvwxrnkq0lzhjr894p420zxffdn34nc2scinmp7qd1hikr51kkp")))) "0mvwxrnkq0lzhjr894p420zxffdn34nc2scinmp7qd1hikr51kkp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; Linux is no longer supported since 2.0.0, use libinput or evdev instead.
(supported-systems '("i586-gnu" "x86_64-gnu"))
(inputs (list xorg-server)) (inputs (list xorg-server))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
@ -6222,7 +6224,6 @@ basic eye-candy effects.")
xorg-server xorg-server
xf86-video-dummy xf86-video-dummy
xf86-input-mouse xf86-input-mouse
xf86-input-keyboard
xxhash xxhash
python-pillow python-pillow
;; Optional dependencies. ;; Optional dependencies.
@ -6288,7 +6289,6 @@ basic eye-candy effects.")
"\nSection \"Files\"\nModulePath \"" "\nSection \"Files\"\nModulePath \""
#$(this-package-input "xf86-video-dummy") "/lib/xorg/modules," #$(this-package-input "xf86-video-dummy") "/lib/xorg/modules,"
#$(this-package-input "xf86-input-mouse") "/lib/xorg/modules," #$(this-package-input "xf86-input-mouse") "/lib/xorg/modules,"
#$(this-package-input "xf86-input-keyboard") "/lib/xorg/modules,"
#$(this-package-input "xorg-server") "/lib/xorg/modules\"\n" #$(this-package-input "xorg-server") "/lib/xorg/modules\"\n"
"EndSection\n\n")) "EndSection\n\n"))
(substitute* '("xpra/scripts/config.py" (substitute* '("xpra/scripts/config.py"

2
gnu/services/xorg.scm
View file

@ -165,9 +165,7 @@
;; Libinput is the new thing and is recommended over evdev/synaptics: ;; Libinput is the new thing and is recommended over evdev/synaptics:
;; <http://who-t.blogspot.fr/2015/01/xf86-input-libinput-compatibility-with.html>. ;; <http://who-t.blogspot.fr/2015/01/xf86-input-libinput-compatibility-with.html>.
xf86-input-libinput xf86-input-libinput
xf86-input-evdev xf86-input-evdev
xf86-input-keyboard
xf86-input-mouse)) xf86-input-mouse))
(define %default-xorg-fonts (define %default-xorg-fonts