From ac995eaf749bceb3a0bf5a7bfefb81b01e75b656 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
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 @@ 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")
-- 
cgit v1.2.3

/a><a href='/guix/'>summary</a><a href='/guix/refs/?id=fc92d33932cd3b581c9085c03751ae4f01ade04b'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/gklib-suitesparse.patch?showmsg=1'>log</a><a href='/guix/tree/gnu/packages/patches/gklib-suitesparse.patch?id=fc92d33932cd3b581c9085c03751ae4f01ade04b'>tree</a><a href='/guix/commit/gnu/packages/patches/gklib-suitesparse.patch?id=fc92d33932cd3b581c9085c03751ae4f01ade04b'>commit</a><a href='/guix/diff/gnu/packages/patches/gklib-suitesparse.patch?id=fc92d33932cd3b581c9085c03751ae4f01ade04b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/gklib-suitesparse.patch'>
<input type='hidden' name='id' value='fc92d33932cd3b581c9085c03751ae4f01ade04b'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fc92d33932cd3b581c9085c03751ae4f01ade04b&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=fc92d33932cd3b581c9085c03751ae4f01ade04b&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/packages?id=fc92d33932cd3b581c9085c03751ae4f01ade04b&amp;showmsg=1'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=fc92d33932cd3b581c9085c03751ae4f01ade04b&amp;showmsg=1'>patches</a>/<a href='/guix/log/gnu/packages/patches/gklib-suitesparse.patch?id=fc92d33932cd3b581c9085c03751ae4f01ade04b&amp;showmsg=1'>gklib-suitesparse.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/gklib-suitesparse.patch?id=fc92d33932cd3b581c9085c03751ae4f01ade04b'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2023-10-06 12:26:45 +0200'>2023-10-06</span></td><td class='logsubject'><a href='/guix/commit/gnu/packages/patches/gklib-suitesparse.patch?id=95ecbdc9b162998c55eb7b355c59fa5205a4373c'>gnu: Add gklib-suitesparse.</a></td><td>David Elsing</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/maths.scm (gklib-suitesparse): New variable.
* gnu/packages/patches/gklib-suitesparse.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>