diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-01-30 21:09:46 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-14 14:19:28 +0100 |
commit | 2c59b40de4cd85a8a837f4f8a68f9bd04bc12101 (patch) | |
tree | 9d6d5e97890378f795f546fb4aacf6ad44b1126a /pkgs/development/libraries/libxkbcommon | |
parent | 9553ca5bb6c01bb72421eb85932feb753c3ec3de (diff) | |
download | nixpkgs-2c59b40de4cd85a8a837f4f8a68f9bd04bc12101.tar nixpkgs-2c59b40de4cd85a8a837f4f8a68f9bd04bc12101.tar.gz nixpkgs-2c59b40de4cd85a8a837f4f8a68f9bd04bc12101.tar.bz2 nixpkgs-2c59b40de4cd85a8a837f4f8a68f9bd04bc12101.tar.lz nixpkgs-2c59b40de4cd85a8a837f4f8a68f9bd04bc12101.tar.xz nixpkgs-2c59b40de4cd85a8a837f4f8a68f9bd04bc12101.tar.zst nixpkgs-2c59b40de4cd85a8a837f4f8a68f9bd04bc12101.zip |
libxkbcommon: 0.7.2 → 0.8.0
Updated, converted to meson and removed flex (not needed since 0.3.1).
Diffstat (limited to 'pkgs/development/libraries/libxkbcommon')
-rw-r--r-- | pkgs/development/libraries/libxkbcommon/default.nix | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index e730cc6eaab..faeed680f3d 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -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 { - name = "libxkbcommon-0.7.2"; + name = "libxkbcommon-0.8.0"; src = fetchurl { - url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; + url = "https://xkbcommon.org/download/${name}.tar.xz"; + sha256 = "0vgy84vfbig5bqznr137h5arjidnfwrxrdli0pxyn2jfn1fjcag8"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ yacc flex xkeyboard_config libxcb ]; + nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ]; + buildInputs = [ xkeyboard_config libxcb ]; - configureFlags = [ - "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" - "--with-x-locale-root=${libX11.out}/share/X11/locale" + patches = [ + # darwin compatibility + (fetchpatch { + url = https://github.com/xkbcommon/libxkbcommon/commit/edb1c662394578a54b7bbed231d918925e5d8150.patch; + sha256 = "0ydjlir32r3xfsbqhnsx1bz6ags2m908yhf9i09i1s7sgcimbcx5"; + }) ]; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/,--version-script=.*$//' Makefile - ''; + mesonFlags = [ + "-Denable-wayland=false" + "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" + "-Dx-locale-root=${libX11.out}/share/X11/locale" + ]; meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = http://xkbcommon.org; + homepage = https://xkbcommon.org; license = licenses.mit; maintainers = with maintainers; [ garbas ttuegel ]; platforms = with platforms; unix; |