diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index d5f542a06fa..1391667e3eb 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -83,7 +83,7 @@ let qtmultimedia = callPackage ./qtmultimedia.nix { inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; }; - qtquick1 = callPackage ./qtquick1.nix {}; + qtquick1 = callPackage ./qtquick1 {}; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; qtscript = callPackage ./qtscript {}; qtsensors = callPackage ./qtsensors.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch new file mode 100644 index 00000000000..63b141f6ce5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch @@ -0,0 +1,37 @@ +From bbc706b3fcb90ca3b2b51d5e3434145572152711 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 17 Oct 2015 09:29:51 -0500 +Subject: [PATCH] nix profiles import paths + +--- + src/declarative/qml/qdeclarativeimport.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp +index 9404834..d185ed5 100644 +--- a/src/declarative/qml/qdeclarativeimport.cpp ++++ b/src/declarative/qml/qdeclarativeimport.cpp +@@ -725,6 +725,20 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) + + 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/imports"); ++ QString canonicalPath = QDir(*it).canonicalPath(); ++ if (!canonicalPath.isEmpty()) { ++ addImportPath(canonicalPath); ++ } ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { +-- +2.5.2 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix similarity index 73% rename from pkgs/development/libraries/qt-5/5.5/qtquick1.nix rename to pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix index 23282e02906..d1c7bb389a4 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix @@ -2,5 +2,6 @@ qtSubmodule { name = "qtquick1"; + patches = [ ./0001-nix-profiles-import-paths.patch ]; qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; }