From dd0d6249190db1ab09dfbe4debcf857f7781616b Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 30 Aug 2022 15:22:17 +0200 Subject: refactor(sterni/emacs): switch to pure gtk emacs 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 Tested-by: BuildkiteCI Reviewed-by: sterni --- users/sterni/emacs/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'users/sterni') 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 -- cgit 1.4.1