about summary refs log tree commit diff
path: root/users/sterni/emacs/default.nix
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-08-30T13·22+0200
committersterni <sternenseemann@systemli.org>2022-08-30T13·31+0000
commitdd0d6249190db1ab09dfbe4debcf857f7781616b (patch)
tree3580a0baf0fd78dfdef69fb050739029d8e26fc9 /users/sterni/emacs/default.nix
parent6c46ecd1c9ed65c937a93528757070feeb325298 (diff)
refactor(sterni/emacs): switch to pure gtk emacs r/4532
This means it'll no longer run under Xwayland. Requires applying small
fix to bqn-mode which stopped compiling with emacs HEAD.

Change-Id: I998a303a0b98bcd45c1de430462b1069bef8718e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6203
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'users/sterni/emacs/default.nix')
-rw-r--r--users/sterni/emacs/default.nix16
1 files changed, 12 insertions, 4 deletions
diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix
index 69d1d4ef41bc..898a60e38546 100644
--- a/users/sterni/emacs/default.nix
+++ b/users/sterni/emacs/default.nix
@@ -1,10 +1,18 @@
 { depot, pkgs, ... }:
 
 let
-  inherit (pkgs.emacsNativeComp.pkgs) withPackages;
-
-  emacs = withPackages (epkgs: [
-    epkgs.bqn-mode
+  # emacsPgtkNativeComp is defined in emacs-overlay
+  emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp).withPackages (epkgs: [
+    (epkgs.bqn-mode.overrideAttrs (old: {
+      patches = old.patches or [ ] ++ [
+        # emacs HEAD doesn't like a missing require in bqn-mode
+        (pkgs.fetchpatch {
+          name = "bqn-mode-emacs-head.patch";
+          url = "https://github.com/museoa/bqn-mode/pull/9/commits/b62d7aff12201a079f60c1842d86610b9331bf53.patch";
+          sha256 = "1i5f2w7rcd9vx8x50ydwqnkxd5c824p5kxj2c00kq3lmiczhr41a";
+        })
+      ];
+    }))
     #epkgs.elpaPackages.ada-mode
     epkgs.elpaPackages.rainbow-mode
     epkgs.elpaPackages.undo-tree