mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
22b10bac78
Qt 5.8 is immediately removed because its support window is ended. The qtlocation module is built with `enableParallelBuilding = false` so that the clipper library will be built before the components which link to it. kjs now depends directly on pcre. The dependency was previously propagated from qtbase, which now depends on pcre2.
21 lines
1,010 B
Diff
21 lines
1,010 B
Diff
Index: qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
|
|
===================================================================
|
|
--- qtdeclarative-opensource-src-5.8.0.orig/src/qml/qml/qqmlimport.cpp
|
|
+++ qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
|
|
@@ -1630,6 +1630,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
|
|
QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
|
|
addImportPath(installImportsPath);
|
|
|
|
+ // Add import paths derived from PATH
|
|
+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
|
|
+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
|
|
+ for (const QString &path: paths) {
|
|
+ if (!path.isEmpty()) {
|
|
+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
|
|
+ }
|
|
+ }
|
|
+
|
|
// env import paths
|
|
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
|
|
const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
|