Merge pull request #108004 from colemickens/libxkbcommon
libxkbcommon: 0.10.0 -> 1.0.3
This commit is contained in:
commit
ada4111334
|
@ -1,30 +1,47 @@
|
||||||
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:
|
{ stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen
|
||||||
|
, xkeyboard_config, libxcb, libxml2
|
||||||
|
, python3
|
||||||
|
, libX11
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libxkbcommon";
|
pname = "libxkbcommon";
|
||||||
version = "0.10.0";
|
version = "1.0.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz";
|
url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1wmnl0hngn6vrqrya4r8hvimlkr4jag39yjprls4gyrqvh667hsp";
|
sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" "doc" ];
|
outputs = [ "out" "dev" "doc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ];
|
nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ];
|
||||||
buildInputs = [ xkeyboard_config libxcb ];
|
buildInputs = [ xkeyboard_config libxcb libxml2 ];
|
||||||
|
checkInputs = [ python3 ];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Denable-wayland=false"
|
|
||||||
"-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
|
"-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
|
||||||
|
"-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc)
|
||||||
"-Dx-locale-root=${libX11.out}/share/X11/locale"
|
"-Dx-locale-root=${libX11.out}/share/X11/locale"
|
||||||
|
"-Denable-wayland=false"
|
||||||
|
"-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output)
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = false; # fails, needs unicode locale
|
doCheck = true;
|
||||||
|
preCheck = ''
|
||||||
|
patchShebangs ../test/
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A library to handle keyboard descriptions";
|
description = "A library to handle keyboard descriptions";
|
||||||
|
longDescription = ''
|
||||||
|
libxkbcommon is a keyboard keymap compiler and support library which
|
||||||
|
processes a reduced subset of keymaps as defined by the XKB (X Keyboard
|
||||||
|
Extension) specification. It also contains a module for handling Compose
|
||||||
|
and dead keys.
|
||||||
|
''; # and a separate library for listing available keyboard layouts.
|
||||||
homepage = "https://xkbcommon.org";
|
homepage = "https://xkbcommon.org";
|
||||||
|
changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ ttuegel ];
|
maintainers = with maintainers; [ ttuegel ];
|
||||||
platforms = with platforms; unix;
|
platforms = with platforms; unix;
|
||||||
|
|
Loading…
Reference in New Issue