From b5ef6f670a95861bb1b0561882349dc06dcbac33 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 12 Nov 2024 23:58:18 +0300
Subject: [PATCH] qt{5,6}.qtbase: build without libinput by default

libinput in Qt itself is only really relevant to embedded-brained
use cases (linuxfb/eglfb backends), and this will allow us to update
libinput trivially on master.
---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 ++++----
 pkgs/development/libraries/qt-6/modules/qtbase.nix | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index eb3fc8af96d7..8828be86c08a 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -7,7 +7,7 @@
 , apple-sdk_13, darwinMinVersionHook, xcbuild
 
 , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite
-, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb
+, libXcursor, libXext, libXi, libXrender, libjpeg, libpng , libxcb
 , libxkbcommon, libxml2, libxslt, openssl, pcre2, sqlite, udev, xcbutil
 , xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core
 
@@ -15,6 +15,7 @@
 , cups ? null, postgresql ? null
 , withGtk3 ? false, dconf, gtk3
 , withQttranslation ? true, qttranslations ? null
+, withLibinput ? false, libinput
 
   # options
 , libGLSupported ? !stdenv.hostPlatform.isDarwin
@@ -80,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: ({
   buildInputs = [ python3 at-spi2-core ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin)
     (
-      [ libinput ]
+      lib.optional withLibinput libinput
       ++ lib.optional withGtk3 gtk3
     )
     ++ lib.optional stdenv.isDarwin darwinVersionInputs
@@ -352,14 +353,13 @@ stdenv.mkDerivation (finalAttrs: ({
       "-L" "${libXrender.out}/lib"
       "-I" "${libXrender.out}/include"
 
-      "-libinput"
-
       ''-${lib.optionalString (cups == null) "no-"}cups''
       "-dbus-linked"
       "-glib"
     ] ++ [
       "-system-libpng"
     ] ++ lib.optional withGtk3 "-gtk"
+      ++ lib.optional withLibinput "-libinput"
       ++ [
         "-inotify"
     ] ++ lib.optionals (cups != null) [
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
index 9df79ccc89be..b57099ba0c00 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@@ -44,7 +44,6 @@
 , libXext
 , libXi
 , libXrender
-, libinput
 , libjpeg
 , libpng
 , libxcb
@@ -78,6 +77,8 @@
 , withGtk3 ? false
 , dconf
 , gtk3
+, withLibinput ? false
+, libinput
   # options
 , libGLSupported ? stdenv.hostPlatform.isLinux
 , libGL
@@ -163,10 +164,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [
     at-spi2-core
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [
-    libinput
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs
   ++ lib.optional withGtk3 gtk3
+  ++ lib.optional withLibinput libinput
   ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
   ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql;