From 773dfa2228130743d4a59f6523807f7d48b14a14 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 9 Mar 2023 00:28:13 -0800 Subject: [PATCH] qt5/qtbase.nix: add mysqlSupport This commit switches `libmysqlclient`-enablement from `!=null`-style to `fooSupport`-style, by adding an additional boolean parameter `mysqlSupport`. This parameter defaults to `stdenv.hostPlatform==stdenv.buildPlatform`, so there should be no change in behavior for the non-cross-compiling case. Co-authored-by: Artturi --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index ef1192e6b106..d74bf46dd6c8 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -13,12 +13,15 @@ , xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core # optional dependencies -, cups ? null, libmysqlclient ? null, postgresql ? null +, cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 # options , libGLSupported ? !stdenv.isDarwin , libGL + # qmake detection for libmysqlclient does not seem to work when cross compiling +, mysqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform +, libmysqlclient , buildExamples ? false , buildTests ? false , debug ? false @@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ) ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups - ++ lib.optional (libmysqlclient != null) libmysqlclient + ++ lib.optional (mysqlSupport) libmysqlclient ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] @@ -258,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: { "-L" "${lib.getLib openssl}/lib" "-I" "${openssl.dev}/include" "-system-sqlite" - ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql'' + ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' "-make libs" @@ -297,7 +300,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (cups != null) [ "-L" "${cups.lib}/lib" "-I" "${cups.dev}/include" - ] ++ lib.optionals (libmysqlclient != null) [ + ] ++ lib.optionals (mysqlSupport) [ "-L" "${libmysqlclient}/lib" "-I" "${libmysqlclient}/include" ]