diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-07-20 15:05:41 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-07-20 15:05:41 -0500 |
| commit | feafb1792622f1df902ccfeaa98fc16e7e7a9a07 (patch) | |
| tree | af68f16a85bea39dc35a9aa5f7d8d8a8dd4dd637 /pkgs/development/libraries | |
| parent | c2f1ac98855c6ed7eddc6f616aaa590758d89f53 (diff) | |
| parent | 6a10139bbaf7ba744f543217a33880c728e2dba0 (diff) | |
| download | nixlib-feafb1792622f1df902ccfeaa98fc16e7e7a9a07.tar nixlib-feafb1792622f1df902ccfeaa98fc16e7e7a9a07.tar.gz nixlib-feafb1792622f1df902ccfeaa98fc16e7e7a9a07.tar.bz2 nixlib-feafb1792622f1df902ccfeaa98fc16e7e7a9a07.tar.lz nixlib-feafb1792622f1df902ccfeaa98fc16e7e7a9a07.tar.xz nixlib-feafb1792622f1df902ccfeaa98fc16e7e7a9a07.tar.zst nixlib-feafb1792622f1df902ccfeaa98fc16e7e7a9a07.zip | |
Merge branch 'qt5-psql'
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.3/default.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 693f62a63ebd..14675af48fbf 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -22,6 +22,8 @@ let ver = "${v_maj}.${v_min}"; in +let system-x86_64 = elem stdenv.system platforms.x86_64; in + stdenv.mkDerivation rec { name = "qt-${ver}"; @@ -126,6 +128,16 @@ stdenv.mkDerivation rec { -no-linuxfb -no-kms + ${optionalString (!system-x86_64) "-no-sse2"} + -no-sse3 + -no-ssse3 + -no-sse4.1 + -no-sse4.2 + -no-avx + -no-avx2 + -no-mips_dsp + -no-mips_dspr2 + -system-zlib -system-libpng -system-libjpeg @@ -144,6 +156,11 @@ stdenv.mkDerivation rec { -${optionalString (buildTests == false) "no"}make tests ''; + # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag + # if dependency paths contain the string "pq", which can occur in the hash. + # To prevent these failures, we need to override PostgreSQL detection. + PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + propagatedBuildInputs = [ xlibs.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre |