about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-08-19T20·46+0100
committerWilliam Carroll <wpcarro@gmail.com>2020-08-20T10·26+0100
commitc9da7c5214fe5d81dd3078064b061bc6c942bec9 (patch)
tree5af1f1502d1c8d86318fdc0901d6a666b8503d36
parent9d7331d63bae9b62a40655d9e6781eb861c92c86 (diff)
Add XMODIFIERS=emacs
This fixes the latest segfault I encountered after
/usr/bin/{google-emacs,emacs} was updated...
-rw-r--r--emacs/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/emacs/default.nix b/emacs/default.nix
index 82cd310cf69d..493782e8394a 100644
--- a/emacs/default.nix
+++ b/emacs/default.nix
@@ -116,6 +116,7 @@ let
 
   withEmacsPath = emacsBin: pkgs.writeShellScriptBin "wpcarros-emacs" ''
     # TODO: Is this the best way to handle environment variables using Nix?
+    export XMODIFIERS=emacs
     export BRIEFCASE=$HOME/briefcase
     export DEPOT=$HOME/depot
 
@@ -134,7 +135,7 @@ let
 in {
   # Use `nix-env -f '<briefcase>' emacs.glinux` to install `wpcarro-emacs` on
   # gLinux machines. This will ensure that X and GL linkage behaves as expected.
-  glinux = withEmacsPath "/usr/bin/emacs";
+  glinux = withEmacsPath "/usr/bin/google-emacs";
 
   # Use `nix-env -f '<briefcase>' emacs.nixos` to install `wpcarros-emacs` on
   # NixOS machines.