Revert "qt 5.12.0 -> 5.12.3"
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448
This reverts commit 552803f6f5.
This commit is contained in:
@@ -229,8 +229,6 @@ stdenv.mkDerivation {
|
||||
"-widgets"
|
||||
"-opengl desktop"
|
||||
"-icu"
|
||||
"-L" "${icu.out}/lib"
|
||||
"-I" "${icu.dev}/include"
|
||||
"-pch"
|
||||
]
|
||||
++ lib.optionals (compareVersion "5.11.0" < 0)
|
||||
@@ -267,18 +265,10 @@ 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''
|
||||
@@ -307,14 +297,10 @@ 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"
|
||||
@@ -335,19 +321,6 @@ 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;
|
||||
|
||||
Reference in New Issue
Block a user