diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 16:05:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 19:50:01 +0200 |
| commit | 0e47fcced442d8e7c1b05184fdc1c14f10ed04ec (patch) | |
| tree | 4ae844bc0ec3c670f8697bdc24362c122fa718ad /gnu/packages/xorg.scm | |
| parent | e4b70bc55a538569465bcedee19d1f2607308e65 (diff) | |
| parent | 8b1bde7bb3936a64244824500ffe60f123704437 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b54523f3b1..9978480e4b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -3991,6 +3992,32 @@ make keyboards more accessible to people with physical impairments.") requested commands if they occur.") (license license:x11))) +(define-public xkbprint + (package + (name "xkbprint") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/app/" + "xkbprint-" version ".tar.bz2")) + (sha256 + (base32 "1yi3232g25hhp241irncd8znv3090k2gm0yjcdnz08h89y1zwn2v")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxkbfile" ,libxkbfile) + ("xorgproto" ,xorgproto))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://www.x.org/wiki/") + (synopsis "Visualise an XKB keyboard layout description") + (description + "The @command{xkbprint} utility visualises (``prints'') an XKB keyboard +description as printable or encapsulated PostScript. It accepts any compiled +keymap (@file{.xkm}) file that includes a geometry description, or can obtain +one from a running X server.") + (license license:x11))) (define-public xkbutils (package @@ -6855,7 +6882,7 @@ box, and a calendar. It uses GTK+, and will match your desktop theme.") (lambda _ (chmod "xvfb-run" #o755) (substitute* "xvfb-run" - (("(\\(| )(fmt|stty|awk|kill|getopt|mktemp|touch|rm|mcookie)" + (("(\\(| )(fmt|stty|awk|cat|kill|getopt|mktemp|touch|rm|mcookie)" _ prefix command) (string-append prefix (which command))) ;; These also feature in UI messages, so be more strict. @@ -6864,13 +6891,15 @@ box, and a calendar. It uses GTK+, and will match your desktop theme.") (string-append prefix (which command)))))) (replace 'check ;; There are no tests included. Here we test whether we can run - ;; a simple client without xvfb-run itself relying on $PATH. + ;; a simple client and whether xvfb-run --help succeeds + ;; without xvfb-run itself relying on $PATH. (lambda* (#:key tests? #:allow-other-keys) (when tests? (let ((old-PATH (getenv "PATH")) (xterm (which "xterm"))) (unsetenv "PATH") (invoke "./xvfb-run" xterm "-e" "true") + (invoke "./xvfb-run" "--help") (setenv "PATH" old-PATH))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) |