diff options
| author | Felix Lechner <felix.lechner@lease-up.com> | 2022-09-20 09:47:35 -0700 |
|---|---|---|
| committer | Guix Patches Tester <> | 2022-11-18 12:51:01 +0100 |
| commit | b228ec6aea43ed5101a94bf0acad2a4f359bc563 (patch) | |
| tree | 721a49c359be26d604243467ddda6f331bd997cf | |
| parent | 983906ab72307a5b848a54233b30d9744356de07 (diff) | |
| download | guix-patches-b228ec6aea43ed5101a94bf0acad2a4f359bc563.tar guix-patches-b228ec6aea43ed5101a94bf0acad2a4f359bc563.tar.gz | |
gnu: libxkbcommon: Switch to gexp; adjust style.issue-57960
* 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.
| -rw-r--r-- | gnu/packages/xdisorg.scm | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 42ee11e904..37c1f97cee 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -501,33 +501,34 @@ avoiding password prompts when X11 forwarding has already been setup.") (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, |