diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index 65a1207dab3a..44530b381505 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.8.0"; + pname = "libxkbcommon"; + version = "0.8.4"; src = fetchurl { - url = "https://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8"; + url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; + sha256 = "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0"; }; outputs = [ "out" "dev" "doc" ]; @@ -13,20 +14,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ]; buildInputs = [ xkeyboard_config libxcb ]; - patches = [ - # darwin compatibility - (fetchpatch { - url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch; - sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5"; - }) - ]; - mesonFlags = [ "-Denable-wayland=false" "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dx-locale-root=${libX11.out}/share/X11/locale" ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Fix build on darwin + (fetchpatch { + url = "https://github.com/xkbcommon/libxkbcommon/commit/32d178b50fe0da05e51e4fe8903c84371d133331.patch"; + sha256 = "1wqdjla8hmgdqr8xc2manw363sxrqqsn3s8bd397h3cd7fj3hh1v"; + }) + ]; + doCheck = false; # fails, needs unicode locale meta = with stdenv.lib; { |