qt{5,6}.qtbase: build without libinput by default (#355517)

This commit is contained in:
Emily
2024-11-12 21:14:38 +00:00
committed by GitHub
2 changed files with 7 additions and 7 deletions
@@ -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) [
@@ -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;