about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorDamien Cassou <damien@cassou.me>2016-09-08 09:05:11 +0200
committerGitHub <noreply@github.com>2016-09-08 09:05:11 +0200
commit6dc9ed317c3d9a42818b76dadaab32ec37b2a040 (patch)
treee54515f5483d4b99385d4512c7829105fe7bbd30 /nixos/modules
parent02bda5d2af455149e4614c3bf2a6f8cd4e93b8bf (diff)
parentf96cd1ea642c6a3f639f8bf9499ac34451afc6b3 (diff)
downloadnixlib-6dc9ed317c3d9a42818b76dadaab32ec37b2a040.tar
nixlib-6dc9ed317c3d9a42818b76dadaab32ec37b2a040.tar.gz
nixlib-6dc9ed317c3d9a42818b76dadaab32ec37b2a040.tar.bz2
nixlib-6dc9ed317c3d9a42818b76dadaab32ec37b2a040.tar.lz
nixlib-6dc9ed317c3d9a42818b76dadaab32ec37b2a040.tar.xz
nixlib-6dc9ed317c3d9a42818b76dadaab32ec37b2a040.tar.zst
nixlib-6dc9ed317c3d9a42818b76dadaab32ec37b2a040.zip
Merge pull request #18244 from DamienCassou/emacs-gtk_data_prefix
emacs module: Fix to get properly themed GTK apps
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/editors/emacs.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index 6795ec52fe4d..08fa6de6374c 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -79,9 +79,13 @@ in {
 
     environment.systemPackages = [ cfg.package editorScript ];
 
-    environment.variables = if cfg.defaultEditor then {
-      EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor";
-    } else {};
+    environment.variables = {
+      # This is required so that GTK applications launched from Emacs
+      # get properly themed:
+      GTK_DATA_PREFIX = "${config.system.path}";
+    } // (if cfg.defaultEditor then {
+        EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor";
+      } else {});
   };
 
   meta.doc = ./emacs.xml;