diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-09-09 15:43:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 15:43:27 +0100 |
| commit | 791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1 (patch) | |
| tree | ce43be481c872a4624e766cf432a29fb5eca273f /pkgs/development/libraries/qt-4.x/4.8/default.nix | |
| parent | be098bacad7859717f9e9ba752c184f7545e7801 (diff) | |
| parent | edf389d92b06633ebdb9b12fa5b83746bad9e001 (diff) | |
| download | nixpkgs-791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1.tar nixpkgs-791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1.tar.gz nixpkgs-791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1.tar.bz2 nixpkgs-791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1.tar.lz nixpkgs-791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1.tar.xz nixpkgs-791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1.tar.zst nixpkgs-791ac31dfa8d9f9e13f0ee07f238dfc6a31476a1.zip | |
Merge pull request #65222 from Izorkin/connector-c
mariadb: update packages
Diffstat (limited to 'pkgs/development/libraries/qt-4.x/4.8/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index b5a10e8f11a..7c7f8f51de7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -2,7 +2,7 @@ , libXrender, libXinerama, libXcursor, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, libGLU, openssl, dbus, cups, pkgconfig -, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi +, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig" "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked" - "-${if mysql != null then "plugin" else "no"}-sql-mysql" "-system-sqlite" + "-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite" "-exceptions" "-xmlpatterns" @@ -192,7 +192,7 @@ stdenv.mkDerivation rec { buildInputs = [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] - ++ lib.optionals (mysql != null) [ mysql.connector-c ] + ++ lib.optionals (libmysqlclient != null) [ libmysqlclient ] ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; |