public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxkbcommon: 1.1.0 -> 1.2.0 (#118589)

Browse Source
This commit is contained in:
Michael Weiss 2021-04-05 15:33:29 +02:00 committed by GitHub
parent 25208eeaba
commit 6602e309e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,19 +8,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxkbcommon"; pname = "libxkbcommon";
version = "1.1.0"; version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz";
sha256 = "0in2fq2x4yhyjmcn9n5n43zsawsdh12d4sm6l57934kgb75gqb21"; sha256 = "16is71cgqnvpl55y9kh1zb7r2gx2f3a1abljm7drjp90nbr7imlg";
}; };
patches = [
./fix-cross-compilation.patch
];
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ]
++ lib.optional withWaylandSupport wayland; ++ lib.optional withWaylandSupport wayland;
buildInputs = [ xkeyboard_config libxcb libxml2 ] buildInputs = [ xkeyboard_config libxcb libxml2 ]

20
pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch
View File

@ -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',