summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers/sddm.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-06-15 07:58:55 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-06-18 08:44:47 -0500
commitdab7700f6ce9266e02a630eea0c4440470ba58e5 (patch)
treea7e4773e97cc8a61f6a1b7d0d4f7fd9626b7a78e /nixos/modules/services/x11/display-managers/sddm.nix
parentce28d8947d3e698f48cbbf4c3291c9427124886e (diff)
downloadnixpkgs-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar
nixpkgs-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.gz
nixpkgs-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.bz2
nixpkgs-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.lz
nixpkgs-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.xz
nixpkgs-dab7700f6ce9266e02a630eea0c4440470ba58e5.tar.zst
nixpkgs-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 'nixos/modules/services/x11/display-managers/sddm.nix')
-rw-r--r--nixos/modules/services/x11/display-managers/sddm.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index bf516235eb2..e6cc02e4d49 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -197,8 +197,10 @@ in
       logsXsession = true;
 
       environment = {
-        # Take themes system environment
-        NIX_PROFILES = "/run/current-system/sw";
+        # Load themes from system environment
+        QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;
+        QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix;
+
         XDG_DATA_DIRS = "/run/current-system/sw/share";
       };