From 45ad92276370615f17df6f4346d479ae502062e5 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 6 Jul 2014 18:13:18 +0200 Subject: libxklavier: fix not finding xkbcomp (fixes #3173) Also refactor the expression a bit, and add description+license. --- pkgs/development/libraries/libxklavier/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries/libxklavier') diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 18f57473fb915..d69276a070bba 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2 -, libICE, glib, libxkbfile, isocodes, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg +, glib, isocodes, gobjectIntrospection }: let version = "5.3"; @@ -13,18 +13,22 @@ stdenv.mkDerivation rec { }; # TODO: enable xmodmap support, needs xmodmap DB - propagatedBuildInputs = [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; + propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gobjectIntrospection ]; - configureFlags = '' - --with-xkb-base=${xkeyboard_config}/etc/X11/xkb - --disable-xmodmap-support - ''; + configureFlags = [ + "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" + "--with-xkb-bin-base=${xorg.xkbcomp}/bin" + "--disable-xmodmap-support" + ]; - meta = { + meta = with stdenv.lib; { + description = "Library providing high-level API for X Keyboard Extension known as XKB"; homepage = http://freedesktop.org/wiki/Software/LibXklavier; + license = licenses.lgpl2Plus; }; } + -- cgit 1.4.1