libxkbcommon: 0.8.0 -> 0.8.4

This commit is contained in:
Tadeo Kondrak 2019-07-04 03:51:56 -06:00 committed by Frederik Rietdijk
parent 3f19225e6f
commit 971c341ccb

View file

@ -1,11 +1,12 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }: { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxkbcommon-0.8.0"; pname = "libxkbcommon";
version = "0.8.4";
src = fetchurl { src = fetchurl {
url = "https://xkbcommon.org/download/${name}.tar.xz"; url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz";
sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8"; sha256 = "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
@ -13,14 +14,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ]; nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ];
buildInputs = [ xkeyboard_config libxcb ]; buildInputs = [ xkeyboard_config libxcb ];
patches = [
# darwin compatibility
(fetchpatch {
url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch;
sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5";
})
];
mesonFlags = [ mesonFlags = [
"-Denable-wayland=false" "-Denable-wayland=false"
"-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"