libxklavier: 5.3 -> 5.4 (#43622)

This commit is contained in:
volth 2018-07-18 21:14:10 +00:00 committed by xeji
parent ecfafb87d6
commit 0f710bc8f6

View File

@ -1,15 +1,16 @@
{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg { stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
, glib, isocodes, gobjectIntrospection }: , glib, isocodes, gobjectIntrospection }:
let let
version = "5.3"; version = "5.4";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxklavier-${version}"; name = "libxklavier-${version}";
src = fetchurl { src = fetchgit {
url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz"; url = "git://anongit.freedesktop.org/git/libxklavier";
sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; rev = name;
sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
@ -17,14 +18,20 @@ stdenv.mkDerivation rec {
# TODO: enable xmodmap support, needs xmodmap DB # TODO: enable xmodmap support, needs xmodmap DB
propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ];
buildInputs = [ gobjectIntrospection ]; buildInputs = [ gobjectIntrospection ];
preAutoreconf = ''
export NOCONFIGURE=1
gtkdocize
'';
configureFlags = [ configureFlags = [
"--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb"
"--with-xkb-bin-base=${xorg.xkbcomp}/bin" "--with-xkb-bin-base=${xorg.xkbcomp}/bin"
"--disable-xmodmap-support" "--disable-xmodmap-support"
"--enable-gtk-doc"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -34,4 +41,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }