public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxklavier: fix not finding xkbcomp (fixes #3173) 

Also refactor the expression a bit,
and add description+license.
This commit is contained in:
Vladimír Čunát 2014-07-06 18:13:18 +02:00
parent 1596c3a012
commit 45ad922763
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/libxklavier/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2 { stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg
, libICE, glib, libxkbfile, isocodes, gobjectIntrospection }: , glib, isocodes, gobjectIntrospection }:
let let
version = "5.3"; version = "5.3";
@ -13,18 +13,22 @@ stdenv.mkDerivation rec {
}; };
# TODO: enable xmodmap support, needs xmodmap DB # 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 ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gobjectIntrospection ]; buildInputs = [ gobjectIntrospection ];
configureFlags = '' configureFlags = [
--with-xkb-base=${xkeyboard_config}/etc/X11/xkb "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb"
--disable-xmodmap-support "--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; homepage = http://freedesktop.org/wiki/Software/LibXklavier;
license = licenses.lgpl2Plus;
}; };
} }