diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-31 16:12:35 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-31 16:12:35 -0500 |
| commit | 314792d9eb92b6dcce57750b9811c8ff5794213e (patch) | |
| tree | 7ab9f4fb15acd6c606bbaf595df1530ced2f3350 /pkgs | |
| parent | da4b9d3b6203c1bc158f875dcdc0cb3ffe0a7c0b (diff) | |
| download | nixpkgs-314792d9eb92b6dcce57750b9811c8ff5794213e.tar nixpkgs-314792d9eb92b6dcce57750b9811c8ff5794213e.tar.gz nixpkgs-314792d9eb92b6dcce57750b9811c8ff5794213e.tar.bz2 nixpkgs-314792d9eb92b6dcce57750b9811c8ff5794213e.tar.lz nixpkgs-314792d9eb92b6dcce57750b9811c8ff5794213e.tar.xz nixpkgs-314792d9eb92b6dcce57750b9811c8ff5794213e.tar.zst nixpkgs-314792d9eb92b6dcce57750b9811c8ff5794213e.zip | |
qtquick1: unset QML_IMPORT_PATH after loading
Diffstat (limited to 'pkgs')
4 files changed, 3 insertions, 39 deletions
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 deleted file mode 100644 index 63b141f6ce5..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bbc706b3fcb90ca3b2b51d5e3434145572152711 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -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/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix index d1c7bb389a4..64937b3dcd3 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix @@ -1,7 +1,7 @@ -{ qtSubmodule, qtscript, qtsvg, qtwebkit, qtxmlpatterns }: +{ qtSubmodule, lib, copyPathsToStore, qtscript, qtsvg, qtwebkit, qtxmlpatterns }: qtSubmodule { name = "qtquick1"; - patches = [ ./0001-nix-profiles-import-paths.patch ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; } 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 new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/series b/pkgs/development/libraries/qt-5/5.5/qtquick1/series new file mode 100644 index 00000000000..7dbe197c56e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/series @@ -0,0 +1 @@ +nix-profiles-import-paths.patch |