diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-15 07:58:55 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:47 -0500 |
| commit | dab7700f6ce9266e02a630eea0c4440470ba58e5 (patch) | |
| tree | a7e4773e97cc8a61f6a1b7d0d4f7fd9626b7a78e /pkgs/applications/display-managers | |
| parent | ce28d8947d3e698f48cbbf4c3291c9427124886e (diff) | |
| download | nixlib-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar nixlib-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.gz nixlib-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.bz2 nixlib-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.lz nixlib-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.xz nixlib-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.zst nixlib-dab7700f6ce9266e02a630eea0c4440470ba58e5.zip | |
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.
Diffstat (limited to 'pkgs/applications/display-managers')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch | 24 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/sddm/series | 3 |
2 files changed, 1 insertions, 26 deletions
diff --git a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch b/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch deleted file mode 100644 index 1783164af46d..000000000000 --- a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch +++ /dev/null @@ -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()); diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series index 703fb6a3fe14..cb6ea65fedb1 100644 --- a/pkgs/applications/display-managers/sddm/series +++ b/pkgs/applications/display-managers/sddm/series @@ -1,2 +1 @@ -sddm-ignore-config-mtime.patch -sddm-nix-profiles.patch +sddm-ignore-config-mtime.patch \ No newline at end of file |