qt58: determine plugin and import paths from PATH

Plugin and QML import paths were previously determined by NIX_PROFILES. Using PATH instead allows Qt applications to work under nix-shell without further modification.
2017-06-18 08:44:47 -05:00
parent ce28d8947d
commit dab7700f6c
9 changed files with 19 additions and 87 deletions
@@ -1,24 +0,0 @@
-Index: sddm-0.14.0/src/daemon/Greeter.cpp
-===================================================================
--- sddm-0.14.0.orig/src/daemon/Greeter.cpp
-+++ sddm-0.14.0/src/daemon/Greeter.cpp
-@@ -157,18 +157,7 @@ namespace SDDM {
-                 << args;
- 
-             // greeter environment
-            QProcessEnvironment env;
-            QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
-
-            insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),
-                                   QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),
-                                   QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),
-                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),
-                                   QStringLiteral("LD_LIBRARY_PATH"),
-                                   QStringLiteral("QML2_IMPORT_PATH"),
-                                   QStringLiteral("QT_PLUGIN_PATH"),
-                                   QStringLiteral("XDG_DATA_DIRS")
-            }, sysenv, env);
-+            QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- 
-             env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
-             env.insert(QStringLiteral("DISPLAY"), m_display->name());
@@ -1,2 +1 @@
-sddm-ignore-config-mtime.patch
-sddm-nix-profiles.patch
+sddm-ignore-config-mtime.patch