mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 21:40:12 +00:00
2873053688
- move patches to their corresponding modules - inline patches list for qtbase into the expression itself - don't treat patches as series, as they are not - clean up outdated headers from all the patches - drop doc tools patch, replace it with setting newly added cmake var in a hook - add a new patch to disable SBOM generation that's very broken with split installs
17 lines
813 B
Diff
17 lines
813 B
Diff
--- a/src/tools/macdeployqt/shared/shared.cpp
|
|
+++ b/src/tools/macdeployqt/shared/shared.cpp
|
|
@@ -1300,6 +1300,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
|
|
argumentList.append( "-importPath");
|
|
argumentList.append(qmlImportsPath);
|
|
|
|
+ // In a modularized installation of qt as we have in Nix, instead, we will
|
|
+ // read the paths from the environment, as they are spread in multiple
|
|
+ // locations and normally set in the environment like this
|
|
+ auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':');
|
|
+ for (const QString &importPath : envQmlImportPaths)
|
|
+ argumentList << "-importPath" << importPath;
|
|
+
|
|
// run qmlimportscanner
|
|
QProcess qmlImportScanner;
|
|
qmlImportScanner.start(qmlImportScannerPath, argumentList);
|