diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-06 18:13:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-07 19:03:10 +0200 |
commit | 45ad92276370615f17df6f4346d479ae502062e5 (patch) | |
tree | 080e2f4f02e967522018cac9d5b595950b12fbd6 /pkgs/development/libraries/libxklavier | |
parent | 1596c3a012517297d98f0c94a17249e2397213bf (diff) | |
download | nixlib-45ad92276370615f17df6f4346d479ae502062e5.tar nixlib-45ad92276370615f17df6f4346d479ae502062e5.tar.gz nixlib-45ad92276370615f17df6f4346d479ae502062e5.tar.bz2 nixlib-45ad92276370615f17df6f4346d479ae502062e5.tar.lz nixlib-45ad92276370615f17df6f4346d479ae502062e5.tar.xz nixlib-45ad92276370615f17df6f4346d479ae502062e5.tar.zst nixlib-45ad92276370615f17df6f4346d479ae502062e5.zip |
libxklavier: fix not finding xkbcomp (fixes #3173)
Also refactor the expression a bit, and add description+license.
Diffstat (limited to 'pkgs/development/libraries/libxklavier')
-rw-r--r-- | pkgs/development/libraries/libxklavier/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 18f57473fb91..d69276a070bb 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; }; } + |