(address . guix-patches@gnu.org)
Hi,
This modernizes the package declaration for libxkbcommon by using
G-expressions. Also, input folders are found via their expected
relative paths (i.e. the modern way) instead of the input label. The
latter was an issue when the official xkeyboard-config was replaced
with a customized package holding additional keyboard layouts.
Ultimately reaches 3435 packages and thus belongs into core-updates.
Kind regards
Felix Lechner
From 81ffbadce5c31f447fce7970908a51d483753b14 Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Tue, 20 Sep 2022 09:47:35 -0700
Subject: [PATCH] gnu: libxkbcommon: Switch to gexp; adjust style.
* gnu/packages/xdisorg.scm (libxkbcommon): Switch to gexp; adjust
style throughout.
[arguments]: Avoid hardcoding inputs; locate inputs via relative
paths, i.e. the modern way.
---
gnu/packages/xdisorg.scm | 47 ++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 23 deletions(-)
Toggle diff (66 lines)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 02e04ccf88..aeacdf8743 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -488,33 +488,34 @@ (define-public libxkbcommon
(name "libxkbcommon")
(version "1.3.0")
(source (origin
- (method url-fetch)
- (uri (string-append "https://xkbcommon.org/download/libxkbcommon-"
- version ".tar.xz"))
- (sha256
- (base32
- "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv"))))
+ (method url-fetch)
+ (uri (string-append
+ "https://xkbcommon.org/download/libxkbcommon-" version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv"))))
(build-system meson-build-system)
- (inputs
- (list libx11
- libxcb
- libxml2
- wayland
- wayland-protocols
- xkeyboard-config))
- (native-inputs
- (list bison doxygen pkg-config python))
+ (inputs (list libx11
+ libxcb
+ libxml2
+ wayland
+ wayland-protocols
+ xkeyboard-config))
+ (native-inputs (list bison doxygen pkg-config python))
(arguments
- `(#:configure-flags
- (list (string-append "-Dxkb-config-root="
- (assoc-ref %build-inputs "xkeyboard-config")
- "/share/X11/xkb")
- (string-append "-Dx-locale-root="
- (assoc-ref %build-inputs "libx11")
- "/share/X11/locale"))))
+ (list #:configure-flags #~(list (string-append "-Dxkb-config-root="
+ (search-input-directory
+ %build-inputs
+ "share/X11/xkb"))
+ (string-append "-Dx-locale-root="
+ (search-input-directory
+ %build-inputs
+ "share/X11/locale")))))
(home-page "https://xkbcommon.org/")
(synopsis "Library to handle keyboard descriptions")
- (description "Xkbcommon is a library to handle keyboard descriptions,
+ (description
+ "Xkbcommon is a library to handle keyboard descriptions,
including loading them from disk, parsing them and handling their
state. It is mainly meant for client toolkits, window systems, and other
system applications; currently that includes Wayland, kmscon, GTK+, Qt,
base-commit: 28918b4ff8d2c297d1f1fb84eebdca9fc2dc9303
--
2.37.3