Merge pull request #220312 from amjoseph-nixpkgs/pr/qt5/cross/mysqlclient

authored by Artturi and committed by GitHub 0c4800d5 d40c0521

+7 -4
+7 -4
pkgs/development/libraries/qt-5/modules/qtbase.nix
··· 13 13 , xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core 14 14 15 15 # optional dependencies 16 - , cups ? null, libmysqlclient ? null, postgresql ? null 16 + , cups ? null, postgresql ? null 17 17 , withGtk3 ? false, dconf, gtk3 18 18 19 19 # options 20 20 , libGLSupported ? !stdenv.isDarwin 21 21 , libGL 22 + # qmake detection for libmysqlclient does not seem to work when cross compiling 23 + , mysqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform 24 + , libmysqlclient 22 25 , buildExamples ? false 23 26 , buildTests ? false 24 27 , debug ? false ··· 73 76 ) 74 77 ++ lib.optional developerBuild gdb 75 78 ++ lib.optional (cups != null) cups 76 - ++ lib.optional (libmysqlclient != null) libmysqlclient 79 + ++ lib.optional (mysqlSupport) libmysqlclient 77 80 ++ lib.optional (postgresql != null) postgresql; 78 81 79 82 nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] ··· 258 261 "-L" "${lib.getLib openssl}/lib" 259 262 "-I" "${openssl.dev}/include" 260 263 "-system-sqlite" 261 - ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql'' 264 + ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql'' 262 265 ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' 263 266 264 267 "-make libs" ··· 297 300 ] ++ lib.optionals (cups != null) [ 298 301 "-L" "${cups.lib}/lib" 299 302 "-I" "${cups.dev}/include" 300 - ] ++ lib.optionals (libmysqlclient != null) [ 303 + ] ++ lib.optionals (mysqlSupport) [ 301 304 "-L" "${libmysqlclient}/lib" 302 305 "-I" "${libmysqlclient}/include" 303 306 ]