summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix Lechner <felix.lechner@lease-up.com>2022-09-20 09:47:35 -0700
committerLudovic Courtès <ludo@gnu.org>2022-10-02 22:37:00 +0200
commit511d584906c6304a3dc6ffcf7096bb14c6bee222 (patch)
tree8ab66e20c5ac4ae476623fd992379ec97008db73
parent8f870574b62dbd063f687b7b21d54a6dbd125e2d (diff)
downloadguix-511d584906c6304a3dc6ffcf7096bb14c6bee222.tar.gz
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>
-rw-r--r--gnu/packages/xdisorg.scm14
1 files 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,