Merge branch 'master' into staging-next
Comments on conflicts: - llvm:d6f401e1vs.469ecc70- docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
This commit is contained in:
Vladimír Čunát
@@ -61,6 +61,9 @@ let
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qttools = [ ./qttools.patch ];
|
||||
qtwebengine =
|
||||
optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
|
||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ];
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
Fix a following build error:
|
||||
|
||||
In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7:
|
||||
../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|."
|
||||
static_assert(
|
||||
^
|
||||
../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here
|
||||
: AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... {
|
||||
^
|
||||
../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here
|
||||
static_assert(internal::AssertBindArgsValidity<
|
||||
^
|
||||
../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
|
||||
return base::BindRepeating(std::forward<Functor>(functor),
|
||||
^
|
||||
../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
|
||||
base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
|
||||
^
|
||||
|
||||
--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
||||
+++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
||||
@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic(
|
||||
base::ThreadTaskRunnerHandle::Get()->PostTask(
|
||||
FROM_HERE,
|
||||
base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
|
||||
- weak_ptr_factory_.GetWeakPtr(), nil));
|
||||
+ weak_ptr_factory_.GetWeakPtr(), nullptr));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,160 @@
|
||||
Fix build against 10.10 SDK
|
||||
|
||||
The SecKey part perhaps could be fixed by implementing a revert to
|
||||
https://chromium.googlesource.com/chromium/src.git/+/8418e098b9cbedf884878b61dcd3292c515845cf%5E%21/#F0
|
||||
|
||||
--- a/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm
|
||||
+++ b/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm
|
||||
@@ -1,3 +1,4 @@
|
||||
+#define NSEventTypeScrollWheel 22
|
||||
// Copyright 2015 The Chromium Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
--- a/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc
|
||||
+++ b/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc
|
||||
@@ -48,21 +48,6 @@ namespace net {
|
||||
|
||||
namespace {
|
||||
|
||||
-// TODO(davidben): Remove this when we switch to building to the 10.13
|
||||
-// SDK. https://crbug.com/780980
|
||||
-#if !defined(MAC_OS_X_VERSION_10_13) || \
|
||||
- MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
|
||||
-API_AVAILABLE(macosx(10.13))
|
||||
-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA256 =
|
||||
- CFSTR("algid:sign:RSA:digest-PSS:SHA256:SHA256:32");
|
||||
-API_AVAILABLE(macosx(10.13))
|
||||
-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA384 =
|
||||
- CFSTR("algid:sign:RSA:digest-PSS:SHA384:SHA384:48");
|
||||
-API_AVAILABLE(macosx(10.13))
|
||||
-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA512 =
|
||||
- CFSTR("algid:sign:RSA:digest-PSS:SHA512:SHA512:64");
|
||||
-#endif
|
||||
-
|
||||
class ScopedCSSM_CC_HANDLE {
|
||||
public:
|
||||
ScopedCSSM_CC_HANDLE() : handle_(0) {}
|
||||
@@ -187,109 +172,6 @@ class SSLPlatformKeyCSSM : public ThreadedSSLPrivateKey::Delegate {
|
||||
DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCSSM);
|
||||
};
|
||||
|
||||
-// Returns the corresponding SecKeyAlgorithm or nullptr if unrecognized.
|
||||
-API_AVAILABLE(macosx(10.12))
|
||||
-SecKeyAlgorithm GetSecKeyAlgorithm(uint16_t algorithm) {
|
||||
- switch (algorithm) {
|
||||
- case SSL_SIGN_RSA_PKCS1_SHA512:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA512;
|
||||
- case SSL_SIGN_RSA_PKCS1_SHA384:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA384;
|
||||
- case SSL_SIGN_RSA_PKCS1_SHA256:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA256;
|
||||
- case SSL_SIGN_RSA_PKCS1_SHA1:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA1;
|
||||
- case SSL_SIGN_RSA_PKCS1_MD5_SHA1:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15Raw;
|
||||
- case SSL_SIGN_ECDSA_SECP521R1_SHA512:
|
||||
- return kSecKeyAlgorithmECDSASignatureDigestX962SHA512;
|
||||
- case SSL_SIGN_ECDSA_SECP384R1_SHA384:
|
||||
- return kSecKeyAlgorithmECDSASignatureDigestX962SHA384;
|
||||
- case SSL_SIGN_ECDSA_SECP256R1_SHA256:
|
||||
- return kSecKeyAlgorithmECDSASignatureDigestX962SHA256;
|
||||
- case SSL_SIGN_ECDSA_SHA1:
|
||||
- return kSecKeyAlgorithmECDSASignatureDigestX962SHA1;
|
||||
- }
|
||||
-
|
||||
- if (base::mac::IsAtLeastOS10_13()) {
|
||||
- switch (algorithm) {
|
||||
- case SSL_SIGN_RSA_PSS_SHA512:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPSSSHA512;
|
||||
- case SSL_SIGN_RSA_PSS_SHA384:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPSSSHA384;
|
||||
- case SSL_SIGN_RSA_PSS_SHA256:
|
||||
- return kSecKeyAlgorithmRSASignatureDigestPSSSHA256;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return nullptr;
|
||||
-}
|
||||
-
|
||||
-class API_AVAILABLE(macosx(10.12)) SSLPlatformKeySecKey
|
||||
- : public ThreadedSSLPrivateKey::Delegate {
|
||||
- public:
|
||||
- SSLPlatformKeySecKey(int type, size_t max_length, SecKeyRef key)
|
||||
- : key_(key, base::scoped_policy::RETAIN) {
|
||||
- // Determine the algorithms supported by the key.
|
||||
- for (uint16_t algorithm : SSLPrivateKey::DefaultAlgorithmPreferences(
|
||||
- type, true /* include PSS */)) {
|
||||
- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm);
|
||||
- if (sec_algorithm &&
|
||||
- SecKeyIsAlgorithmSupported(key_.get(), kSecKeyOperationTypeSign,
|
||||
- sec_algorithm)) {
|
||||
- preferences_.push_back(algorithm);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- ~SSLPlatformKeySecKey() override {}
|
||||
-
|
||||
- std::vector<uint16_t> GetAlgorithmPreferences() override {
|
||||
- return preferences_;
|
||||
- }
|
||||
-
|
||||
- Error Sign(uint16_t algorithm,
|
||||
- base::span<const uint8_t> input,
|
||||
- std::vector<uint8_t>* signature) override {
|
||||
- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm);
|
||||
- if (!sec_algorithm) {
|
||||
- NOTREACHED();
|
||||
- return ERR_FAILED;
|
||||
- }
|
||||
-
|
||||
- const EVP_MD* md = SSL_get_signature_algorithm_digest(algorithm);
|
||||
- uint8_t digest[EVP_MAX_MD_SIZE];
|
||||
- unsigned digest_len;
|
||||
- if (!md || !EVP_Digest(input.data(), input.size(), digest, &digest_len, md,
|
||||
- nullptr)) {
|
||||
- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
|
||||
- }
|
||||
-
|
||||
- base::ScopedCFTypeRef<CFDataRef> digest_ref(CFDataCreateWithBytesNoCopy(
|
||||
- kCFAllocatorDefault, digest, base::checked_cast<CFIndex>(digest_len),
|
||||
- kCFAllocatorNull));
|
||||
-
|
||||
- base::ScopedCFTypeRef<CFErrorRef> error;
|
||||
- base::ScopedCFTypeRef<CFDataRef> signature_ref(SecKeyCreateSignature(
|
||||
- key_, sec_algorithm, digest_ref, error.InitializeInto()));
|
||||
- if (!signature_ref) {
|
||||
- LOG(ERROR) << error;
|
||||
- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
|
||||
- }
|
||||
-
|
||||
- signature->assign(
|
||||
- CFDataGetBytePtr(signature_ref),
|
||||
- CFDataGetBytePtr(signature_ref) + CFDataGetLength(signature_ref));
|
||||
- return OK;
|
||||
- }
|
||||
-
|
||||
- private:
|
||||
- std::vector<uint16_t> preferences_;
|
||||
- base::ScopedCFTypeRef<SecKeyRef> key_;
|
||||
-
|
||||
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeySecKey);
|
||||
-};
|
||||
-
|
||||
scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
|
||||
const X509Certificate* certificate,
|
||||
SecKeyRef private_key) {
|
||||
@@ -298,13 +180,6 @@ scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
|
||||
if (!GetClientCertInfo(certificate, &key_type, &max_length))
|
||||
return nullptr;
|
||||
|
||||
- if (base::mac::IsAtLeastOS10_12()) {
|
||||
- return base::MakeRefCounted<ThreadedSSLPrivateKey>(
|
||||
- std::make_unique<SSLPlatformKeySecKey>(key_type, max_length,
|
||||
- private_key),
|
||||
- GetSSLPlatformKeyTaskRunner());
|
||||
- }
|
||||
-
|
||||
const CSSM_KEY* cssm_key;
|
||||
OSStatus status = SecKeyGetCSSMKey(private_key, &cssm_key);
|
||||
if (status != noErr) {
|
||||
@@ -1,2 +1,2 @@
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \
|
||||
-A '*.tar.xz' )
|
||||
|
||||
@@ -1,16 +1,3 @@
|
||||
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
index 66baf16..89794ef 100644
|
||||
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
|
||||
|
||||
QFixed QCoreTextFontEngine::emSquareSize() const
|
||||
{
|
||||
- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
|
||||
+ return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
|
||||
}
|
||||
|
||||
QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
|
||||
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||
index 341d3bc..3368234 100644
|
||||
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||
|
||||
@@ -3,275 +3,275 @@
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp";
|
||||
name = "qt3d-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qt3d-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0skdp72jlfy97cw9lpa3l2ivs6f5x9w53978sf2xbkl9k1ai268l";
|
||||
name = "qt3d-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r";
|
||||
name = "qtactiveqt-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtactiveqt-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "01yp0railyc80ldvpiy36lpsdk26rs8vfp78xca9jy1glm4cmaik";
|
||||
name = "qtactiveqt-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtandroidextras = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n";
|
||||
name = "qtandroidextras-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtandroidextras-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1bl05hr0zm23z7qig3kxhzyvm440wfrjfgsxvpmlvk9pbb8h2q63";
|
||||
name = "qtandroidextras-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y";
|
||||
name = "qtbase-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtbase-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "004gs95ig51jv2wz64kwzl4rvqqzs4rln3kqmzjs3sh6y1s9bp9n";
|
||||
name = "qtbase-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcanvas3d = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y";
|
||||
name = "qtcanvas3d-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcanvas3d-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "131zwqddjns7cpkdbr33jahqgvnw6f8gdcr1b2hmadi0p2shrcwq";
|
||||
name = "qtcanvas3d-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc";
|
||||
name = "qtcharts-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcharts-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1rkj4lkpgdqk4ygxivkj7gc8mlccb5sgi9mfr0xwvq5j85r3dk8n";
|
||||
name = "qtcharts-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2";
|
||||
name = "qtconnectivity-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtconnectivity-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0f7g2lfnfgsjka7y5hdf0lbzpfxlxh8bfhdxix44cwlmwzjizy3l";
|
||||
name = "qtconnectivity-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh";
|
||||
name = "qtdatavis3d-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdatavis3d-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "08anm8byxcym7h1n49j3cbxkh3kh3xjlxd3b8vi8fxyqqhvll4lv";
|
||||
name = "qtdatavis3d-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh";
|
||||
name = "qtdeclarative-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdeclarative-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0p26c96fb33khbf7ws91ha73n72lwmn714v8spg0bla9m1jkfhk8";
|
||||
name = "qtdeclarative-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5";
|
||||
name = "qtdoc-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdoc-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1vs6dy0mdcn65fhpl8nib0pjw9bliqkjnaahqm833ayvxr15vzyj";
|
||||
name = "qtdoc-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgamepad = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6";
|
||||
name = "qtgamepad-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgamepad-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0242683h9jz6b0n11s4m4ii2691dbws0gkj45n6sx6z513blfx9f";
|
||||
name = "qtgamepad-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgraphicaleffects = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr";
|
||||
name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgraphicaleffects-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1yhxa3i3jvfnc9l6a3q3pyk7y702a3pp87ypshb63607xvrxrv2d";
|
||||
name = "qtgraphicaleffects-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl";
|
||||
name = "qtimageformats-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtimageformats-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1an0k3rzxjc4x4rscnibdk36zff6g1n41lh5dasys4jc05k3w1b2";
|
||||
name = "qtimageformats-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0";
|
||||
name = "qtlocation-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtlocation-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0lp6zn630px1lj7623shq47dlv02nr0aj7iqscrk0yzhygbv7dc2";
|
||||
name = "qtlocation-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmacextras = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy";
|
||||
name = "qtmacextras-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmacextras-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0b0znccbach41la226cmps9aaigpz8mj940xj890arjf8hn4jd97";
|
||||
name = "qtmacextras-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7";
|
||||
name = "qtmultimedia-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmultimedia-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "060gic3gl27r7k4vw4n550384b4wadqfn3biajbq6lbyj3zhgxxx";
|
||||
name = "qtmultimedia-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz";
|
||||
name = "qtnetworkauth-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtnetworkauth-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "14n8wzsyq7bw67r1k442widfvszawgi5sh0b10h2jcrp5aikqr0p";
|
||||
name = "qtnetworkauth-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpurchasing = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j";
|
||||
name = "qtpurchasing-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtpurchasing-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1qvxsi0ar04qy0zajbhvwj5blldhfq2mn3laq15g0xxy1xh4m46i";
|
||||
name = "qtpurchasing-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih";
|
||||
name = "qtquickcontrols-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1jkz2b2wzxzmskvwwb4afqxz0yp0siaf3yhj2i01y865sp6q1wz0";
|
||||
name = "qtquickcontrols-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols2 = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1";
|
||||
name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols2-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0w9rq77a8vc9avhbwbx7swg7zw7jn21wd7si59822rw9ln1p6zb0";
|
||||
name = "qtquickcontrols2-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk";
|
||||
name = "qtremoteobjects-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtremoteobjects-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1ninscf4jkframv585zzi76fml1lyz0mhb091r2r54lrf66wl3lw";
|
||||
name = "qtremoteobjects-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscript = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq";
|
||||
name = "qtscript-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscript-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0mv33a1mjaahq7ixfasvjasc881bprfbkjhx8pn3z5f0l8213m67";
|
||||
name = "qtscript-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq";
|
||||
name = "qtscxml-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscxml-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0xz2q2bl1n43gxx00nrzyc0bsnq4wch0k2rkj3prc9gsgmpq0bih";
|
||||
name = "qtscxml-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr";
|
||||
name = "qtsensors-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsensors-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0pfh4lr9zxsh9winzx1lmcgl2hgp9lr45smcvslr4an93z6mbf8r";
|
||||
name = "qtsensors-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg";
|
||||
name = "qtserialbus-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialbus-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0n6z56axm0gbrxmnwbz8fv40ar9mw1rlfvmpqvpg5xb9031qil1b";
|
||||
name = "qtserialbus-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac";
|
||||
name = "qtserialport-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialport-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "05qy4m1p5j5bh6af7d97iblsmgy9kppm5wif3bl63p6yghn319sh";
|
||||
name = "qtserialport-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1";
|
||||
name = "qtspeech-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtspeech-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0nnbqnh18vw26vphancs38vjr816xha8m6wl389kjqi01kjrcz70";
|
||||
name = "qtspeech-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz";
|
||||
name = "qtsvg-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsvg-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0r2mqy6lb2ypmilf83zyp73v5d9ars314jfm6f0fv5if8yw253v2";
|
||||
name = "qtsvg-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24";
|
||||
name = "qttools-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttools-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "18b7jg25434p80yr929nfihk0i124bxpd2dv9mqdcicnv5q0ybnn";
|
||||
name = "qttools-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20";
|
||||
name = "qttranslations-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttranslations-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "051a3igp1qnd7d7bg2dvjaqwh6f67fvkn19jdfjzrdis7kcsfvdk";
|
||||
name = "qttranslations-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr";
|
||||
name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtvirtualkeyboard-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1qcj6ncg53rv4pg4ijdq7vbkzgzfr9bn40aif7g4dndykj0zwla7";
|
||||
name = "qtvirtualkeyboard-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih";
|
||||
name = "qtwayland-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwayland-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0y6ky1ipg42gq390ibgr4nns9i4j648yb7bkmx6b7lhsi7mvnp2n";
|
||||
name = "qtwayland-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3";
|
||||
name = "qtwebchannel-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebchannel-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "189qkfxixddfblwkaf46yrqjp91vhmw90gpafjryqfmd2141r8qj";
|
||||
name = "qtwebchannel-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5";
|
||||
name = "qtwebengine-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebengine-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0kzpgks5h19rm7gbhr688lr5f5d9ykf062kj91q7wf6fk7qd72v2";
|
||||
name = "qtwebengine-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebkit = {
|
||||
@@ -291,43 +291,43 @@
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf";
|
||||
name = "qtwebsockets-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebsockets-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1qqvd6qf7m2xq71mdaidwabj5c03cbbi1hwc7p95fvbnz9crz79x";
|
||||
name = "qtwebsockets-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf";
|
||||
name = "qtwebview-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebview-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1zwqkmzik4f83hdffmw0hz90mzga34hkyz7d0skfbdp25y278r12";
|
||||
name = "qtwebview-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwinextras = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl";
|
||||
name = "qtwinextras-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwinextras-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "1a57v7krglfdi4gizm402jn9pg7fqpcma7xk6sm68zg1siv11a6x";
|
||||
name = "qtwinextras-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtx11extras = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74";
|
||||
name = "qtx11extras-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtx11extras-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "02jdiw94dasnkszi5w1pysfgz8xrr71pzah37nbnqg0knn4dzich";
|
||||
name = "qtx11extras-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
qtxmlpatterns = {
|
||||
version = "5.9.3";
|
||||
version = "5.9.7";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz";
|
||||
sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g";
|
||||
name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtxmlpatterns-opensource-src-5.9.7.tar.xz";
|
||||
sha256 = "0j0rxkpyww5cgcjhy0332jsyka1d811wf6zmr16d5fdkbryp7d65";
|
||||
name = "qtxmlpatterns-opensource-src-5.9.7.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
, pciutils
|
||||
, systemd
|
||||
, enableProprietaryCodecs ? true
|
||||
, gn, darwin, openbsm
|
||||
, gn
|
||||
, cups, darwin, openbsm, runCommand, xcbuild
|
||||
, ffmpeg ? null
|
||||
, lib, stdenv
|
||||
}:
|
||||
@@ -26,7 +27,7 @@ qtModule {
|
||||
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
|
||||
nativeBuildInputs = [
|
||||
bison coreutils flex git gperf ninja pkgconfig python2 which gn
|
||||
];
|
||||
] ++ optional stdenv.isDarwin xcbuild;
|
||||
doCheck = true;
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
@@ -42,7 +43,7 @@ qtModule {
|
||||
( cd src/3rdparty/chromium; patchShebangs . )
|
||||
''
|
||||
# Patch Chromium build files
|
||||
+ optionalString (builtins.compareVersions qtCompatVersion "5.12" < 0) ''
|
||||
+ optionalString (lib.versionOlder qtCompatVersion "5.12") ''
|
||||
substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo
|
||||
substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/toolchain.gypi \
|
||||
--replace /bin/echo ${coreutils}/bin/echo
|
||||
@@ -65,33 +66,46 @@ qtModule {
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
|
||||
''
|
||||
+ optionalString stdenv.isDarwin ''
|
||||
+ optionalString stdenv.isDarwin (''
|
||||
# Remove annoying xcode check
|
||||
substituteInPlace mkspecs/features/platform.prf \
|
||||
--replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false
|
||||
--replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \
|
||||
--replace "/usr/bin/xcodebuild" "xcodebuild"
|
||||
|
||||
substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \
|
||||
--replace "/usr/bin/xcode-select" "xcode-select"
|
||||
|
||||
substituteInPlace src/core/config/mac_osx.pri \
|
||||
--replace /usr ${stdenv.cc} \
|
||||
--replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false
|
||||
|
||||
# FIXME Needed with old Apple SDKs
|
||||
# Abandon all hope ye who try to make sense of this.
|
||||
''
|
||||
# TODO remove when new Apple SDK is in
|
||||
+ (if lib.versionOlder qtCompatVersion "5.11" then ''
|
||||
substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \
|
||||
--replace "NSArray<NSString*>*" "NSArray*"
|
||||
substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \
|
||||
--replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \
|
||||
--replace "NSArray<VNRequest*>*" "NSArray*" \
|
||||
--replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
|
||||
'' else ''
|
||||
substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \
|
||||
--replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*"
|
||||
substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \
|
||||
--replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*"
|
||||
'')
|
||||
+ ''
|
||||
|
||||
cat <<EOF > src/3rdparty/chromium/build/mac/find_sdk.py
|
||||
#!/usr/bin/env python
|
||||
print("${darwin.apple_sdk.sdk}")
|
||||
print("10.10.0")
|
||||
print("")
|
||||
EOF
|
||||
|
||||
cat <<EOF > src/3rdparty/chromium/build/config/mac/sdk_info.py
|
||||
#!/usr/bin/env python
|
||||
print('xcode_version="9.1"')
|
||||
print('xcode_version_int=9')
|
||||
print('xcode_version="0910"')
|
||||
print('xcode_version_int=910')
|
||||
print('xcode_build="9B55"')
|
||||
print('machine_os_build="17E199"')
|
||||
print('sdk_path=""')
|
||||
@@ -100,12 +114,32 @@ print('sdk_platform_path=""')
|
||||
print('sdk_build="17B41"')
|
||||
EOF
|
||||
|
||||
substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
|
||||
--replace '$sysroot/usr' "${darwin.xnu}"
|
||||
|
||||
# Apple has some secret stuff they don't share with OpenBSM
|
||||
substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
|
||||
--replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
|
||||
substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \
|
||||
--replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
|
||||
'');
|
||||
|
||||
NIX_CFLAGS_COMPILE =
|
||||
lib.optionalString stdenv.isDarwin [
|
||||
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
|
||||
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
|
||||
|
||||
#
|
||||
# Prevent errors like
|
||||
# /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
|
||||
# error: pointer to non-const type 'id' with no explicit ownership
|
||||
# id** _kvcPropertyAccessors;
|
||||
#
|
||||
# TODO remove when new Apple SDK is in
|
||||
#
|
||||
"-fno-objc-arc"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export NINJAFLAGS=-j$NIX_BUILD_CORES
|
||||
@@ -160,7 +194,10 @@ EOF
|
||||
|
||||
# frameworks
|
||||
ApplicationServices
|
||||
AVFoundation
|
||||
Foundation
|
||||
ForceFeedback
|
||||
GameController
|
||||
AppKit
|
||||
ImageCaptureCore
|
||||
CoreBluetooth
|
||||
@@ -173,8 +210,28 @@ EOF
|
||||
libunwind
|
||||
]);
|
||||
|
||||
buildInputs = optionals stdenv.isDarwin (with darwin; [
|
||||
cups
|
||||
|
||||
# For sandbox.h include
|
||||
(runCommand "MacOS_SDK_sandbox.h" {} ''
|
||||
install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h
|
||||
'')
|
||||
|
||||
# For:
|
||||
# _NSDefaultRunLoopMode
|
||||
# _OBJC_CLASS_$_NSDate
|
||||
# _OBJC_CLASS_$_NSDictionary
|
||||
# _OBJC_CLASS_$_NSRunLoop
|
||||
# _OBJC_CLASS_$_NSURL
|
||||
darwin.cf-private
|
||||
]);
|
||||
|
||||
__impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib";
|
||||
|
||||
dontUseNinjaBuild = true;
|
||||
dontUseNinjaInstall = true;
|
||||
dontUseXcbuild = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
cat > $out/libexec/qt.conf <<EOF
|
||||
|
||||
Reference in New Issue
Block a user