diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
commit | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (patch) | |
tree | 28f7989183b690ecafdb0360c0fee406aac88bcc /pkgs/development/libraries/qt-5/modules | |
parent | 6b2aa16ec1926f7027ad03ebf2b9b43370cb5e54 (diff) | |
parent | 447d625edc3a488deee1c9b2e5890dd974e55ee3 (diff) | |
download | nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.gz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.bz2 nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.lz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.xz nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.zst nixlib-9f8a7d26798ced69f3185a59383bbb3db6b06bde.zip |
Merge branch 'staging' into staging-next
This brings openssl CVE fixes, and I can't see anything too risky in there, so let's merge these two staging iterations together.
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
-rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index e2c71a77062e..8119513618b2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -14,7 +14,7 @@ zlib, # optional dependencies - cups ? null, mysql ? null, postgresql ? null, + cups ? null, libmysqlclient ? null, postgresql ? null, withGtk3 ? false, dconf ? null, gtk3 ? null, # options @@ -80,7 +80,7 @@ stdenv.mkDerivation { ) ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.connector-c + ++ lib.optional (libmysqlclient != null) libmysqlclient ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = @@ -285,7 +285,7 @@ stdenv.mkDerivation { "-L" "${openssl.out}/lib" "-I" "${openssl.dev}/include" "-system-sqlite" - ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' + ''-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' "-make libs" @@ -349,9 +349,9 @@ stdenv.mkDerivation { "-L" "${cups.lib}/lib" "-I" "${cups.dev}/include" ] - ++ lib.optionals (mysql != null) [ - "-L" "${mysql.out}/lib" - "-I" "${mysql.out}/include" + ++ lib.optionals (libmysqlclient != null) [ + "-L" "${libmysqlclient}/lib" + "-I" "${libmysqlclient}/include" ] ); |