From c9da7c5214fe5d81dd3078064b061bc6c942bec9 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Wed, 19 Aug 2020 21:46:12 +0100
Subject: [PATCH] Add XMODIFIERS=emacs

This fixes the latest segfault I encountered after
/usr/bin/{google-emacs,emacs} was updated...
---
 emacs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emacs/default.nix b/emacs/default.nix
index 82cd310cf..493782e83 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.