dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libxkbcommon: 0.7.2 → 0.8.0

Browse Source 
Updated, converted to meson and removed flex (not needed since 0.3.1).
This commit is contained in:
Jan Tojnar 2018-01-30 21:09:46 +01:00
parent 9553ca5bb6
commit 2c59b40de4
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/libraries/libxkbcommon/default.nix
View File

@ -1,30 +1,35 @@
{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxkbcommon-0.7.2"; name = "libxkbcommon-0.8.0";
src = fetchurl { src = fetchurl {
url = "http://xkbcommon.org/download/${name}.tar.xz"; url = "https://xkbcommon.org/download/${name}.tar.xz";
sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ];
buildInputs = [ yacc flex xkeyboard_config libxcb ]; buildInputs = [ xkeyboard_config libxcb ];
configureFlags = [ patches = [
"--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" # darwin compatibility
"--with-x-locale-root=${libX11.out}/share/X11/locale" (fetchpatch {
url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch;
sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5";
})
]; ];
preBuild = stdenv.lib.optionalString stdenv.isDarwin '' mesonFlags = [
sed -i 's/,--version-script=.*$//' Makefile "-Denable-wayland=false"
''; "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
"-Dx-locale-root=${libX11.out}/share/X11/locale"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A library to handle keyboard descriptions"; description = "A library to handle keyboard descriptions";
homepage = http://xkbcommon.org; homepage = https://xkbcommon.org;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ garbas ttuegel ]; maintainers = with maintainers; [ garbas ttuegel ];
platforms = with platforms; unix; platforms = with platforms; unix;