diff options
| author | volth <volth@webmaster.ms> | 2018-07-18 21:14:10 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-18 23:14:10 +0200 |
| commit | 0f710bc8f67794c033b65b45804636fd0cc86ec2 (patch) | |
| tree | ef65cb052cb3ace86463523b73d1a4779658bd92 /pkgs | |
| parent | ecfafb87d6d15ccef213288d42f7d55ca3af3434 (diff) | |
| download | nixlib-0f710bc8f67794c033b65b45804636fd0cc86ec2.tar nixlib-0f710bc8f67794c033b65b45804636fd0cc86ec2.tar.gz nixlib-0f710bc8f67794c033b65b45804636fd0cc86ec2.tar.bz2 nixlib-0f710bc8f67794c033b65b45804636fd0cc86ec2.tar.lz nixlib-0f710bc8f67794c033b65b45804636fd0cc86ec2.tar.xz nixlib-0f710bc8f67794c033b65b45804636fd0cc86ec2.tar.zst nixlib-0f710bc8f67794c033b65b45804636fd0cc86ec2.zip | |
libxklavier: 5.3 -> 5.4 (#43622)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libxklavier/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 1150d04e1b49..263796cdc783 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -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 }: let - version = "5.3"; + version = "5.4"; in stdenv.mkDerivation rec { name = "libxklavier-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz"; - sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; + src = fetchgit { + url = "git://anongit.freedesktop.org/git/libxklavier"; + rev = name; + sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -17,14 +18,20 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ]; buildInputs = [ gobjectIntrospection ]; + preAutoreconf = '' + export NOCONFIGURE=1 + gtkdocize + ''; + configureFlags = [ "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-bin-base=${xorg.xkbcomp}/bin" "--disable-xmodmap-support" + "--enable-gtk-doc" ]; meta = with stdenv.lib; { @@ -34,4 +41,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - |