From 7c6454d95b03ef03f9ec7414539cf92d3d805b47 Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Sun, 26 Jan 2020 17:10:31 +0100
Subject: [PATCH] emacs: Fix emacs-daemon crashes.

---
 options/emacs-init.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/options/emacs-init.nix b/options/emacs-init.nix
index af5d85e..717590d 100644
--- a/options/emacs-init.nix
+++ b/options/emacs-init.nix
@@ -402,7 +402,16 @@ in
           concatMap (v: getPkg (v.package))
             (builtins.attrValues cfg.usePackage)
         );
-    machine.pkgsets.emacs.pkgwrap = (pkgs.emacsWithPackages config.machine.pkgsets.emacs.pkgs);
+
+    # use lucid as toolkit; emacs will otherwise crash quite frequently when run in daemon mode
+    # https://gitlab.gnome.org/GNOME/gtk/issues/221
+    machine.pkgsets.emacs.pkgwrap = let
+      emacsWithPackages = (pkgs.emacsPackagesFor
+        (pkgs.emacs.override {
+          withGTK2 = false;
+          withGTK3 = false;
+        })).emacsWithPackages;
+    in (emacsWithPackages config.machine.pkgsets.emacs.pkgs);
 
     environment.systemPackages = [
       ((pkgs.emacsPackagesNgGen config.machine.pkgsets.emacs.pkgwrap).trivialBuild {