diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-15 07:02:49 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-20 10:01:06 -0500 |
| commit | 35f9c58206dac4a5f57c52da86774e2e656bcb64 (patch) | |
| tree | 333c2f85f33717fd8b3dc3a47df1a82cf882580f /pkgs/development/libraries/qt-5/5.5 | |
| parent | e0a87ce931e69f2775d99de12986f1e6b5ea70aa (diff) | |
qt55.qtquick1: get import paths from NIX_PROFILES
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch index e69de29bb2d1d..c01061d3378bb 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch @@ -0,0 +1,20 @@ +Index: qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp +=================================================================== +--- qtquick1-opensource-src-5.5.1.orig/src/declarative/qml/qdeclarativeimport.cpp ++++ qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp +@@ -725,6 +725,15 @@ QDeclarativeImportDatabase::QDeclarative + + addImportPath(installImportsPath); + ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ const QString importdir = QString::fromLatin1("/lib/qt5/imports"); ++ Q_FOREACH (const QByteArray &profile, profiles) { ++ if (!profile.isEmpty()) { ++ addImportPath(QFile::decodeName(profile) + importdir); ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { |