branch core-updates updated: gnu: libxkbcommon: Switch to gexp; avoid hardcoding inputs.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 511d584906 gnu: libxkbcommon: Switch to gexp; avoid hardcoding inputs.
511d584906 is described below

commit 511d584906c6304a3dc6ffcf7096bb14c6bee222
Author: Felix Lechner <felix.lechner@lease-up.com>
AuthorDate: Tue Sep 20 09:47:35 2022 -0700

    gnu: libxkbcommon: Switch to gexp; avoid hardcoding inputs.
    
    * gnu/packages/xdisorg.scm (libxkbcommon): Switch to gexp.
    [arguments]: Avoid hardcoding inputs and locate them via relative
    paths instead.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/xdisorg.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 02e04ccf88..a16b882cea 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -505,13 +505,13 @@ avoiding password prompts when X11 forwarding has already 
been setup.")
     (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,