From ac995eaf749bceb3a0bf5a7bfefb81b01e75b656 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 8 Aug 2014 02:28:44 -0400 Subject: gnu: setxkbmap: Use xkeyboard-config as default config root. * gnu/packages/xorg.scm (setxkbmap): Add 'xkeyboard-config' as an input. Pass --with-xkb-config-root to configure. --- gnu/packages/xorg.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ce07d77299..eeeb0a597d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1696,9 +1696,15 @@ (define-public setxkbmap (build-system gnu-build-system) (inputs `(("libxkbfile" ,libxkbfile) + ("xkeyboard-config" ,xkeyboard-config) ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) + (arguments + `(#:configure-flags + (list (string-append "--with-xkb-config-root=" + (assoc-ref %build-inputs "xkeyboard-config") + "/share/X11/xkb")))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") -- cgit v1.2.3