Revert "Revert "qt 5.12.0 -> 5.12.3""

This reverts commit bf39fc17d4.
This commit is contained in:
Thomas Tuegel
2019-08-06 14:42:51 -05:00
parent 2c55b3256c
commit 469d17a3f0
7 changed files with 216 additions and 215 deletions
@@ -229,6 +229,8 @@ stdenv.mkDerivation {
"-widgets"
"-opengl desktop"
"-icu"
"-L" "${icu.out}/lib"
"-I" "${icu.dev}/include"
"-pch"
]
++ lib.optionals (compareVersion "5.11.0" < 0)
@@ -265,10 +267,18 @@ stdenv.mkDerivation {
++ [
"-system-zlib"
"-L" "${zlib.out}/lib"
"-I" "${zlib.dev}/include"
"-system-libjpeg"
"-L" "${libjpeg.out}/lib"
"-I" "${libjpeg.dev}/include"
"-system-harfbuzz"
"-L" "${harfbuzz.out}/lib"
"-I" "${harfbuzz.dev}/include"
"-system-pcre"
"-openssl-linked"
"-L" "${openssl.out}/lib"
"-I" "${openssl.dev}/include"
"-system-sqlite"
''-${if mysql != null then "plugin" else "no"}-sql-mysql''
''-${if postgresql != null then "plugin" else "no"}-sql-psql''
@@ -297,10 +307,14 @@ stdenv.mkDerivation {
"-system-xcb"
"-xcb"
"-qpa xcb"
"-L" "${libX11.out}/lib"
"-I" "${libX11.out}/include"
"-L" "${libXext.out}/lib"
"-I" "${libXext.out}/include"
"-L" "${libXrender.out}/lib"
"-I" "${libXrender.out}/include"
"-system-xkbcommon"
"-libinput"
"-xkbcommon-evdev"
"-no-eglfs"
"-no-gbm"
@@ -321,6 +335,19 @@ stdenv.mkDerivation {
"-no-feature-renameat2"
"-no-feature-getentropy"
]
++ lib.optionals (compareVersion "5.12.1" < 0) [
# use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1
"-system-xkbcommon"
"-xkbcommon-evdev"
]
++ lib.optionals (cups != null) [
"-L" "${cups.lib}/lib"
"-I" "${cups.dev}/include"
]
++ lib.optionals (mysql != null) [
"-L" "${mysql.out}/lib"
"-I" "${mysql.out}/include"
]
);
enableParallelBuilding = true;