diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
| commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
| tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/development/libraries/libxkbcommon | |
| parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
| parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
| download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip | |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libxkbcommon')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch | 20 |
2 files changed, 3 insertions, 26 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index d6e8b3958e40..8c37bb0c173b 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -8,19 +8,16 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0in2fq2x4yhyjmcn9n5n43zsawsdh12d4sm6l57934kgb75gqb21"; + sha256 = "1cqzd4vd5jw3ghibmdqvy90mb1h8vvazc81bxgavk6sc0b9sfcz8"; }; - patches = [ - ./fix-cross-compilation.patch - ]; - outputs = [ "out" "dev" "doc" ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] ++ lib.optional withWaylandSupport wayland; buildInputs = [ xkeyboard_config libxcb libxml2 ] diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch b/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch deleted file mode 100644 index 55730554a90f..000000000000 --- a/nixpkgs/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', |