From ab7fc081d7724c8978fac0ddfa73355c596c169d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 7 Feb 2024 23:12:36 +0000 Subject: [PATCH] evtest-qt: 0.2.0 -> 0.2.0-unstable-2023-09-13 The main change is the build fix against `gcc-13` https://hydra.nixos.org/build/247729704: In file included from /build/source/src/evdev_info.cpp:17: /build/source/src/evdev_info.hpp:74:12: error: 'uint16_t' was not declared in this scope 74 | std::map absinfos; | ^~~~~~~~ --- pkgs/applications/misc/evtest-qt/default.nix | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix index 86f2d0070923..9092fe99ff76 100644 --- a/pkgs/applications/misc/evtest-qt/default.nix +++ b/pkgs/applications/misc/evtest-qt/default.nix @@ -1,20 +1,33 @@ -{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub }: +{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub, fetchpatch, unstableGitUpdater }: mkDerivation rec { pname = "evtest-qt"; - version = "0.2.0"; + version = "0.2.0-unstable-2023-09-13"; src = fetchFromGitHub { owner = "Grumbel"; repo = pname; - rev = "v${version}"; - sha256 = "1wfzkgq81764qzxgk0y5vvpxcrb3icvrr4dd4mj8njrqgbwmn0mw"; + rev = "fb087f4d3d51377790f1ff30681c48031bf23145"; + hash = "sha256-gE47x1J13YZUVyB0b4VRyESIVCm3GbOXp2bX0TP97UU="; + fetchSubmodules = true; }; + patches = [ + # Fix build against gcc-13: + # https://github.com/Grumbel/evtest-qt/pull/14 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/Grumbel/evtest-qt/commit/975dedcfd60853bd329f34d48ce4740add8866eb.patch"; + hash = "sha256-gR/9oVhO4G9i7dn+CjvDAQN0KLXoX/fatpE0W3gXDc0="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; + passthru.updateScript = unstableGitUpdater {}; + meta = with lib; { description = "Simple input device tester for linux with Qt GUI"; homepage = "https://github.com/Grumbel/evtest-qt";