diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 1391667e3eb..10d7f6eb914 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -73,7 +73,7 @@ let /* qtandroidextras = not packaged */ /* qtcanvas3d = not packaged */ qtconnectivity = callPackage ./qtconnectivity.nix {}; - qtdeclarative = callPackage ./qtdeclarative.nix {}; + qtdeclarative = callPackage ./qtdeclarative {}; qtdoc = callPackage ./qtdoc.nix {}; qtenginio = callPackage ./qtenginio.nix {}; qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch new file mode 100644 index 00000000000..8e86f97a947 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From 3f6fa74067aacd0e595e45b4ef7ce754514cb205 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 17 Oct 2015 09:28:18 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/qml/qml/qqmlimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 5a54609..f33c2f9 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1549,6 +1549,20 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from NIX_PROFILES. ++ const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); ++ if (!nixProfilesEnv.isEmpty()) { ++ QLatin1Char pathSep(' '); ++ QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); ++ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { ++ it->append("/lib/qt5/qml"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix similarity index 75% rename from pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix rename to pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix index a71f11b7d40..9181c37b225 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix @@ -2,6 +2,7 @@ qtSubmodule { name = "qtdeclarative"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python ]; }