aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-08-08 02:28:44 -0400
committerMark H Weaver <mhw@netris.org>2014-08-08 02:34:53 -0400
commitac995eaf749bceb3a0bf5a7bfefb81b01e75b656 (patch)
tree14e470533bfa60c5020a77e2941aeec55dd4e100
parent1f347f55333251059cf26c900e75115e70959606 (diff)
downloadguix-ac995eaf749bceb3a0bf5a7bfefb81b01e75b656.tar
guix-ac995eaf749bceb3a0bf5a7bfefb81b01e75b656.tar.gz
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.
-rw-r--r--gnu/packages/xorg.scm6
1 files changed, 6 insertions, 0 deletions
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 @@ tracking.")
(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")