summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2014-11-22 00:14:09 +0100
committerAndreas Enge <andreas@enge.fr>2014-11-22 13:06:58 +0100
commit5dee80dde28bbaf00a1bc6c22a2e38474db00634 (patch)
tree6dbba7c78f5e65bbbe4d7c5ca56f583753e08907
parent8b6a5e0f82660492612ee78894f02d82ac5324a2 (diff)
downloadguix-5dee80dde28bbaf00a1bc6c22a2e38474db00634.tar.gz
gnu: libxkbcommon: Add inputs libx11 and xkeyboard-config and use
  corresponding configure flags.

* gnu/packages/qt.scm (libxkbcommon): Add inputs libx11 and xkeyboard-config.
    Use configure flags to set XKB config root and X11 locale root
    directories.
-rw-r--r--gnu/packages/qt.scm12
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8d688ff7f4..30b772d4d9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -53,10 +53,20 @@
                "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
     (build-system gnu-build-system)
     (inputs
-     `(("libxcb" ,libxcb)))
+     `(("libx11" ,libx11)
+       ("libxcb" ,libxcb)
+       ("xkeyboard-config" ,xkeyboard-config)))
     (native-inputs
      `(("bison" ,bison)
        ("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-xkb-config-root="
+                            (assoc-ref %build-inputs "xkeyboard-config")
+                            "/share/X11/xkb")
+             (string-append "--with-x-locale-root="
+                            (assoc-ref %build-inputs "libx11")
+                            "/share/X11/locale"))))
     (home-page "http://xkbcommon.org/")
     (synopsis "Library to handle keyboard descriptions")
     (description "Xkbcommon is a library to handle keyboard descriptions,