···

       
197
       
197
       
 
       
      logsXsession = true;

     

       
198
       
198
       
 
       


     

       
199
       
199
       
 
       
      environment = {

     

       
200
       
200
       
-
       
        # Take themes system environment

     

       
201
       
201
       
-
       
        NIX_PROFILES = "/run/current-system/sw";

     

       
200
       
200
       
+
       
        # Load themes from system environment

     

       
201
       
201
       
+
       
        QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;

     

       
202
       
202
       
+
       
        QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix;

     

       
203
       
203
       
+
       


     

       
202
       
204
       
 
       
        XDG_DATA_DIRS = "/run/current-system/sw/share";

     

       
203
       
205
       
 
       
      };

     

       
204
       
206
       
 
       


     

···

       
1
       
1
       
-
       
Index: sddm-0.14.0/src/daemon/Greeter.cpp

     

       
2
       
2
       
-
       
===================================================================

     

       
3
       
3
       
-
       
--- sddm-0.14.0.orig/src/daemon/Greeter.cpp

     

       
4
       
4
       
-
       
+++ sddm-0.14.0/src/daemon/Greeter.cpp

     

       
5
       
5
       
-
       
@@ -157,18 +157,7 @@ namespace SDDM {

     

       
6
       
6
       
-
       
                 << args;

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
             // greeter environment

     

       
9
       
9
       
-
       
-            QProcessEnvironment env;

     

       
10
       
10
       
-
       
-            QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();

     

       
11
       
11
       
-
       
-

     

       
12
       
12
       
-
       
-            insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),

     

       
13
       
13
       
-
       
-                                   QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),

     

       
14
       
14
       
-
       
-                                   QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),

     

       
15
       
15
       
-
       
-                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),

     

       
16
       
16
       
-
       
-                                   QStringLiteral("LD_LIBRARY_PATH"),

     

       
17
       
17
       
-
       
-                                   QStringLiteral("QML2_IMPORT_PATH"),

     

       
18
       
18
       
-
       
-                                   QStringLiteral("QT_PLUGIN_PATH"),

     

       
19
       
19
       
-
       
-                                   QStringLiteral("XDG_DATA_DIRS")

     

       
20
       
20
       
-
       
-            }, sysenv, env);

     

       
21
       
21
       
-
       
+            QProcessEnvironment env = QProcessEnvironment::systemEnvironment();

     

       
22
       
22
       
-
       
 

     

       
23
       
23
       
-
       
             env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());

     

       
24
       
24
       
-
       
             env.insert(QStringLiteral("DISPLAY"), m_display->name());

     

···

       
1
       
1
       
-
       
sddm-ignore-config-mtime.patch

     

       
2
       
2
       
-
       
sddm-nix-profiles.patch

     

       
1
       
1
       
+
       
sddm-ignore-config-mtime.patch
     

···

       
132
       
132
       
 
       
        -docdir $out/$qtDocPrefix"

     

       
133
       
133
       
 
       


     

       
134
       
134
       
 
       
    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""

     

       
135
       
135
       
-
       
    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""

     

       
136
       
135
       
 
       
  '';

     

       
137
       
136
       
 
       


     

       
138
       
137
       
 
       


     

···

       
6
       
6
       
 
       
         QStringList *app_libpaths = new QStringList;

     

       
7
       
7
       
 
       
         coreappdata()->app_libpaths.reset(app_libpaths);

     

       
8
       
8
       
 
       
 

     

       
9
       
9
       
-
       
+        // Add library paths derived from NIX_PROFILES.

     

       
10
       
10
       
-
       
+        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');

     

       
11
       
11
       
-
       
+        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);

     

       
12
       
12
       
-
       
+        for (const QString &profile: profiles) {

     

       
13
       
13
       
-
       
+            if (!profile.isEmpty()) {

     

       
14
       
14
       
-
       
+                app_libpaths->append(profile + QDir::separator() + plugindir);

     

       
9
       
9
       
+
       
+        // Add library paths derived from PATH

     

       
10
       
10
       
+
       
+        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');

     

       
11
       
11
       
+
       
+        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);

     

       
12
       
12
       
+
       
+        for (const QString &path: paths) {

     

       
13
       
13
       
+
       
+            if (!path.isEmpty()) {

     

       
14
       
14
       
+
       
+                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));

     

       
15
       
15
       
 
       
+            }

     

       
16
       
16
       
 
       
+        }

     

       
17
       
17
       
 
       
+

     

···

       
1
       
1
       
-
       
Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp

     

       
2
       
2
       
-
       
===================================================================

     

       
3
       
3
       
-
       
--- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qplatformintegrationfactory.cpp

     

       
4
       
4
       
-
       
+++ qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp

     

       
5
       
5
       
-
       
@@ -62,9 +62,10 @@ QPlatformIntegration *QPlatformIntegrati

     

       
6
       
6
       
-
       
     // Try loading the plugin from platformPluginPath first:

     

       
7
       
7
       
-
       
     if (!platformPluginPath.isEmpty()) {

     

       
8
       
8
       
-
       
         QCoreApplication::addLibraryPath(platformPluginPath);

     

       
9
       
9
       
-
       
-        if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))

     

       
10
       
10
       
-
       
-            return ret;

     

       
11
       
11
       
-
       
     }

     

       
12
       
12
       
-
       
+    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));

     

       
13
       
13
       
-
       
+    if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))

     

       
14
       
14
       
-
       
+        return ret;

     

       
15
       
15
       
-
       
 #else

     

       
16
       
16
       
-
       
     Q_UNUSED(platformPluginPath);

     

       
17
       
17
       
-
       
 #endif

     

       
18
       
18
       
-
       
@@ -84,15 +85,16 @@ QStringList QPlatformIntegrationFactory:

     

       
19
       
19
       
-
       
 #ifndef QT_NO_LIBRARY

     

       
20
       
20
       
-
       
     if (!platformPluginPath.isEmpty()) {

     

       
21
       
21
       
-
       
         QCoreApplication::addLibraryPath(platformPluginPath);

     

       
22
       
22
       
-
       
-        list = directLoader()->keyMap().values();

     

       
23
       
23
       
-
       
-        if (!list.isEmpty()) {

     

       
24
       
24
       
-
       
-            const QString postFix = QLatin1String(" (from ")

     

       
25
       
25
       
-
       
-                                    + QDir::toNativeSeparators(platformPluginPath)

     

       
26
       
26
       
-
       
-                                    + QLatin1Char(')');

     

       
27
       
27
       
-
       
-            const QStringList::iterator end = list.end();

     

       
28
       
28
       
-
       
-            for (QStringList::iterator it = list.begin(); it != end; ++it)

     

       
29
       
29
       
-
       
-                (*it).append(postFix);

     

       
30
       
30
       
-
       
-        }

     

       
31
       
31
       
-
       
+    }

     

       
32
       
32
       
-
       
+    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));

     

       
33
       
33
       
-
       
+    list = directLoader()->keyMap().values();

     

       
34
       
34
       
-
       
+    if (!list.isEmpty()) {

     

       
35
       
35
       
-
       
+        const QString postFix = QLatin1String(" (from ")

     

       
36
       
36
       
-
       
+            + QDir::toNativeSeparators(platformPluginPath)

     

       
37
       
37
       
-
       
+            + QLatin1Char(')');

     

       
38
       
38
       
-
       
+        const QStringList::iterator end = list.end();

     

       
39
       
39
       
-
       
+        for (QStringList::iterator it = list.begin(); it != end; ++it)

     

       
40
       
40
       
-
       
+            (*it).append(postFix);

     

       
41
       
41
       
-
       
     }

     

       
42
       
42
       
-
       
 #else

     

       
43
       
43
       
-
       
     Q_UNUSED(platformPluginPath);

     

···

       
2
       
2
       
 
       
tzdir.patch

     

       
3
       
3
       
 
       
dlopen-libXcursor.patch

     

       
4
       
4
       
 
       
xdg-config-dirs.patch

     

       
5
       
5
       
-
       
nix-profiles-library-paths.patch

     

       
5
       
5
       
+
       
library-paths.patch

     

       
6
       
6
       
 
       
libressl.patch

     

       
7
       
7
       
-
       
qpa-platform-plugin-path.patch

     

       
8
       
7
       
 
       
dlopen-gl.patch

     

       
9
       
8
       
 
       
compose-search-path.patch

     

       
10
       
9
       
 
       
cmake-paths.patch

     

···

       
6
       
6
       
 
       
     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);

     

       
7
       
7
       
 
       
     addImportPath(installImportsPath);

     

       
8
       
8
       
 
       
 

     

       
9
       
9
       
-
       
+    // Add library paths derived from NIX_PROFILES.

     

       
10
       
10
       
-
       
+    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');

     

       
11
       
11
       
-
       
+    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);

     

       
12
       
12
       
-
       
+    for (const QString &profile: profiles) {

     

       
13
       
13
       
-
       
+        if (!profile.isEmpty()) {

     

       
14
       
14
       
-
       
+            addImportPath(profile + QDir::separator() + qmldir);

     

       
9
       
9
       
+
       
+    // Add import paths derived from PATH

     

       
10
       
10
       
+
       
+    const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');

     

       
11
       
11
       
+
       
+    const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);

     

       
12
       
12
       
+
       
+    for (const QString &path: paths) {

     

       
13
       
13
       
+
       
+        if (!path.isEmpty()) {

     

       
14
       
14
       
+
       
+            addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));

     

       
15
       
15
       
 
       
+        }

     

       
16
       
16
       
 
       
+    }

     

       
17
       
17
       
 
       
+

     

···

       
1
       
1
       
-
       
nix-profiles-import-paths.patch

     

       
1
       
1
       
+
       
import-paths.patch