From 6602e309e19538ab5dfbce1f7f6aaaa0d5219600 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 5 Apr 2021 15:33:29 +0200 Subject: [PATCH] libxkbcommon: 1.1.0 -> 1.2.0 (#118589) --- .../libraries/libxkbcommon/default.nix | 9 +++------ .../libxkbcommon/fix-cross-compilation.patch | 20 ------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index fbf3117fa35..4e0c4033cb4 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -8,19 +8,16 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0in2fq2x4yhyjmcn9n5n43zsawsdh12d4sm6l57934kgb75gqb21"; + sha256 = "16is71cgqnvpl55y9kh1zb7r2gx2f3a1abljm7drjp90nbr7imlg"; }; - patches = [ - ./fix-cross-compilation.patch - ]; - outputs = [ "out" "dev" "doc" ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] ++ lib.optional withWaylandSupport wayland; buildInputs = [ xkeyboard_config libxcb libxml2 ] diff --git a/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch b/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch deleted file mode 100644 index 55730554a90..00000000000 --- a/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/meson.build b/meson.build -index 47c436f..536c60b 100644 ---- a/meson.build -+++ b/meson.build -@@ -440,13 +440,12 @@ if build_tools - if get_option('enable-wayland') - wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) - wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) -- wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) -- if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() -+ if not wayland_client_dep.found() or not wayland_protocols_dep.found() - error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. - You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') - endif - -- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) -+ wayland_scanner = find_program('wayland-scanner', native: true) - wayland_scanner_code_gen = generator( - wayland_scanner, - output: '@BASENAME@-protocol.c',