From 469d17a3f0d8089cd14435b87d3886f1eeac27ec Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 6 Aug 2019 14:42:51 -0500
Subject: [PATCH] Revert "Revert "qt 5.12.0 -> 5.12.3""
This reverts commit bf39fc17d46b48e3883dd646bc0ecc0ccfb67df4.
---
.../libraries/qt-5/5.12/default.nix | 1 -
pkgs/development/libraries/qt-5/5.12/fetch.sh | 2 +-
.../libraries/qt-5/5.12/qtbase.patch | 49 +--
.../qt-5/5.12/qtwebengine-CVE-2019-5786.patch | 26 --
pkgs/development/libraries/qt-5/5.12/srcs.nix | 320 +++++++++---------
.../libraries/qt-5/modules/qtbase.nix | 31 +-
pkgs/top-level/all-packages.nix | 2 +-
7 files changed, 216 insertions(+), 215 deletions(-)
delete mode 100644 pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 1bc63d0e2b9d..7b4addd91617 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -59,7 +59,6 @@ let
qtserialport = [ ./qtserialport.patch ];
qtwebengine = [
./qtwebengine-no-build-skip.patch
- ./qtwebengine-CVE-2019-5786.patch
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh
index aa3a0fe94898..a4d2fc82ff2d 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
index aa987acbe92e..a3b4e438fe81 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
@@ -2,7 +2,7 @@ diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 61bea952b2..9909dae726 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
-@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \
+@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
QMAKE_FIX_RPATH = install_name_tool -id
@@ -90,7 +90,7 @@ index 2ed708e085..05e60ff45f 100644
INSTALLS += cmake_qt5_plugin_file
return()
-@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) {
+@@ -318,7 +293,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@@ -263,15 +263,14 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul
index 99f68b78f5..dde69cb7c2 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
-@@ -63,199 +63,3 @@ qt {
- }
+@@ -64,202 +64,6 @@
}
}
--
+
-# Add the same default rpaths as Xcode does for new projects.
-# This is especially important for iOS/tvOS/watchOS where no other option is possible.
-!no_default_rpath {
-- QMAKE_RPATHDIR += @executable_path/Frameworks
+- QMAKE_RPATHDIR += @executable_path/../Frameworks
- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
-}
-
@@ -463,6 +462,10 @@ index 99f68b78f5..dde69cb7c2 100644
- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier}
-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}"
-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
+-
+ !macx-xcode {
+ generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_)
+ generate_xcode_project.target = xcodeproj
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e3534561a5..3b01424e67 100644
--- a/mkspecs/features/mac/default_pre.prf
@@ -532,7 +535,7 @@ diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 8360dd8b38..8b13789179 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
-@@ -1,58 +1 @@
+@@ -1,54 +1 @@
-isEmpty(QMAKE_MAC_SDK): \
- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
@@ -568,10 +571,6 @@ index 8360dd8b38..8b13789179 100644
-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
-
--sysrootified =
--for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
--QMAKE_INCDIR_OPENGL = $$sysrootified
--
-QMAKESPEC_NAME = $$basename(QMAKESPEC)
-
-# Resolve SDK version of various tools
@@ -595,24 +594,24 @@ diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index 65212b2abf..accd4c07f0 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
-@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_
- # Tools need qmldir and plugins.qmltypes always installed on the file system
- qmldir.files = $$qmldir_file $$fq_aux_qml_files
+@@ -54,7 +54,7 @@
+
+ qmldir.files = $$qmldir_file
install_qml_files: qmldir.files += $$fq_qml_files
--qmldir.path = $$instbase/$$TARGETPATH
+-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
+qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH
INSTALLS += qmldir
- !debug_and_release|!build_all|CONFIG(release, debug|release) {
+ qmlfiles.base = $$_PRO_FILE_PWD_
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index cd6377dcc6..e98bf98151 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
-@@ -56,7 +56,7 @@ qml1_target {
- instbase = $$[QT_INSTALL_QML]
- }
+@@ -50,7 +50,7 @@
--target.path = $$instbase/$$TARGETPATH
+ DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
+
+-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH
+target.path = $$NIX_OUTPUT_QML/$$TARGETPATH
INSTALLS += target
@@ -746,7 +745,7 @@ index 8f98987b99..21b3bb8b32 100644
!static: target.CONFIG = no_dll
INSTALLS += target
}
-@@ -29,33 +23,33 @@
+@@ -29,35 +23,35 @@
#headers
qt_install_headers {
gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
@@ -762,6 +761,8 @@ index 8f98987b99..21b3bb8b32 100644
private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+ generated_privates: \
+ private_headers.CONFIG += no_check_exist
INSTALLS += private_headers
qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
@@ -876,7 +877,7 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea
index 463e30e1c3..0e1ab669e4 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths()
+@@ -2668,6 +2668,15 @@
QStringList *app_libpaths = new QStringList;
coreappdata()->app_libpaths.reset(app_libpaths);
@@ -889,9 +890,9 @@ index 463e30e1c3..0e1ab669e4 100644
+ }
+ }
+
- const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
+ QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH");
if (!libPathEnv.isEmpty()) {
- QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
+ QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
index bed62a02bd..73158993f7 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
deleted file mode 100644
index ec9a432ea708..000000000000
--- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-@@ -135,14 +135,16 @@
- if (!raw_data_ || error_code_)
- return nullptr;
-
-- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-- if (finished_loading_) {
-- array_buffer_result_ = result;
-- AdjustReportedMemoryUsageToV8(
-- -1 * static_cast<int64_t>(raw_data_->ByteLength()));
-- raw_data_.reset();
-+ if (!finished_loading_) {
-+ return DOMArrayBuffer::Create(
-+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
- }
-- return result;
-+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-+ AdjustReportedMemoryUsageToV8(-1 *
-+ static_cast<int64_t>(raw_data_->ByteLength()));
-+
-+ raw_data_.reset();
-+ return array_buffer_result_;
- }
-
- String FileReaderLoader::StringResult() {
diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix
index d83edc97e94f..ce567c3a2bcd 100644
--- a/pkgs/development/libraries/qt-5/5.12/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix
@@ -3,323 +3,323 @@
{
qt3d = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz";
- sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1";
- name = "qt3d-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz";
+ sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d";
+ name = "qt3d-everywhere-src-5.12.3.tar.xz";
};
};
qtactiveqt = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz";
- sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52";
- name = "qtactiveqt-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz";
+ sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f";
+ name = "qtactiveqt-everywhere-src-5.12.3.tar.xz";
};
};
qtandroidextras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz";
- sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm";
- name = "qtandroidextras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f";
+ name = "qtandroidextras-everywhere-src-5.12.3.tar.xz";
};
};
qtbase = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz";
- sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy";
- name = "qtbase-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz";
+ sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701";
+ name = "qtbase-everywhere-src-5.12.3.tar.xz";
};
};
qtcanvas3d = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz";
- sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj";
- name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz";
+ sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea";
+ name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz";
};
};
qtcharts = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz";
- sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww";
- name = "qtcharts-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz";
+ sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9";
+ name = "qtcharts-everywhere-src-5.12.3.tar.xz";
};
};
qtconnectivity = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz";
- sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f";
- name = "qtconnectivity-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz";
+ sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661";
+ name = "qtconnectivity-everywhere-src-5.12.3.tar.xz";
};
};
qtdatavis3d = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz";
- sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf";
- name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313";
+ name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz";
};
};
qtdeclarative = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz";
- sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag";
- name = "qtdeclarative-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz";
+ sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7";
+ name = "qtdeclarative-everywhere-src-5.12.3.tar.xz";
};
};
qtdoc = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz";
- sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h";
- name = "qtdoc-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz";
+ sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f";
+ name = "qtdoc-everywhere-src-5.12.3.tar.xz";
};
};
qtgamepad = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz";
- sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac";
- name = "qtgamepad-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz";
+ sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642";
+ name = "qtgamepad-everywhere-src-5.12.3.tar.xz";
};
};
qtgraphicaleffects = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
- sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1";
- name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
+ sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73";
+ name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
};
};
qtimageformats = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz";
- sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z";
- name = "qtimageformats-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz";
+ sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2";
+ name = "qtimageformats-everywhere-src-5.12.3.tar.xz";
};
};
qtlocation = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz";
- sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh";
- name = "qtlocation-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz";
+ sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6";
+ name = "qtlocation-everywhere-src-5.12.3.tar.xz";
};
};
qtmacextras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz";
- sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr";
- name = "qtmacextras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed";
+ name = "qtmacextras-everywhere-src-5.12.3.tar.xz";
};
};
qtmultimedia = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz";
- sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw";
- name = "qtmultimedia-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz";
+ sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301";
+ name = "qtmultimedia-everywhere-src-5.12.3.tar.xz";
};
};
qtnetworkauth = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz";
- sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1";
- name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz";
+ sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332";
+ name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz";
};
};
qtpurchasing = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz";
- sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr";
- name = "qtpurchasing-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz";
+ sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e";
+ name = "qtpurchasing-everywhere-src-5.12.3.tar.xz";
};
};
qtquickcontrols = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz";
- sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb";
- name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz";
+ sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46";
+ name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz";
};
};
qtquickcontrols2 = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
- sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9";
- name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
+ sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a";
+ name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
};
};
qtremoteobjects = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz";
- sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09";
- name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz";
+ sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42";
+ name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz";
};
};
qtscript = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz";
- sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp";
- name = "qtscript-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz";
+ sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e";
+ name = "qtscript-everywhere-src-5.12.3.tar.xz";
};
};
qtscxml = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz";
- sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw";
- name = "qtscxml-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz";
+ sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19";
+ name = "qtscxml-everywhere-src-5.12.3.tar.xz";
};
};
qtsensors = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz";
- sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5";
- name = "qtsensors-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz";
+ sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc";
+ name = "qtsensors-everywhere-src-5.12.3.tar.xz";
};
};
qtserialbus = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz";
- sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb";
- name = "qtserialbus-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz";
+ sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d";
+ name = "qtserialbus-everywhere-src-5.12.3.tar.xz";
};
};
qtserialport = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz";
- sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r";
- name = "qtserialport-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz";
+ sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51";
+ name = "qtserialport-everywhere-src-5.12.3.tar.xz";
};
};
qtspeech = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz";
- sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r";
- name = "qtspeech-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz";
+ sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5";
+ name = "qtspeech-everywhere-src-5.12.3.tar.xz";
};
};
qtsvg = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz";
- sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb";
- name = "qtsvg-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2";
+ name = "qtsvg-everywhere-src-5.12.3.tar.xz";
};
};
qttools = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz";
- sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p";
- name = "qttools-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz";
+ sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8";
+ name = "qttools-everywhere-src-5.12.3.tar.xz";
};
};
qttranslations = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz";
- sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv";
- name = "qttranslations-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz";
+ sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca";
+ name = "qttranslations-everywhere-src-5.12.3.tar.xz";
};
};
qtvirtualkeyboard = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
- sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv";
- name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
+ sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22";
+ name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
};
};
qtwayland = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz";
- sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m";
- name = "qtwayland-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff";
+ name = "qtwayland-everywhere-src-5.12.3.tar.xz";
};
};
qtwebchannel = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz";
- sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5";
- name = "qtwebchannel-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz";
+ sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a";
+ name = "qtwebchannel-everywhere-src-5.12.3.tar.xz";
};
};
qtwebengine = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz";
- sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x";
- name = "qtwebengine-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz";
+ sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317";
+ name = "qtwebengine-everywhere-src-5.12.3.tar.xz";
};
};
qtwebglplugin = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz";
- sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5";
- name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz";
+ sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3";
+ name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz";
};
};
qtwebsockets = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz";
- sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4";
- name = "qtwebsockets-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz";
+ sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577";
+ name = "qtwebsockets-everywhere-src-5.12.3.tar.xz";
};
};
qtwebview = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz";
- sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p";
- name = "qtwebview-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5";
+ name = "qtwebview-everywhere-src-5.12.3.tar.xz";
};
};
qtwinextras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz";
- sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6";
- name = "qtwinextras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b";
+ name = "qtwinextras-everywhere-src-5.12.3.tar.xz";
};
};
qtx11extras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz";
- sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06";
- name = "qtx11extras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613";
+ name = "qtx11extras-everywhere-src-5.12.3.tar.xz";
};
};
qtxmlpatterns = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
- sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk";
- name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
+ sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61";
+ name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 458946b803d2..8506a80ddf3f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1eb600bd429..a352a56ed316 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12960,7 +12960,7 @@ in
inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups;
- harfbuzz = harfbuzzFull;
+ inherit harfbuzz;
inherit libGL;
inherit perl;
inherit gtk3;