about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-08-08T13·09+0300
committertazjin <mail@tazj.in>2021-08-08T13·18+0000
commit56c9fa9722c88d2e6b39396eb8de61c42e6f18e5 (patch)
treec7370c9c15c4ebff6dd90a99f071ae647d0b5b02
parente7de89e06aad3ccb83eb4085be82449d8f81f56c (diff)
fix(tazjin/emacs): Temporary fixes to use unstable telega r/2711
The latest Emacs versions removed some (private) functions that telega
depends on, and this is fixed in HEAD of telega.el.

However, without these fixes, the unstable version of telega doesn't
build because the patch Nix tries to apply doesn't match the source
anymore.

The patch itself doesn't seem to do anything relevant for me.

Change-Id: Ib9a042c636cb438b2b15d231a07afd5c02be72ee
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3294
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
-rw-r--r--third_party/emacs/telega.nix6
-rw-r--r--users/tazjin/emacs/default.nix3
2 files changed, 8 insertions, 1 deletions
diff --git a/third_party/emacs/telega.nix b/third_party/emacs/telega.nix
new file mode 100644
index 000000000000..a4c034b24224
--- /dev/null
+++ b/third_party/emacs/telega.nix
@@ -0,0 +1,6 @@
+# Temporary fix for unstable telega that tries to build with a broken patch.
+{ pkgs, ... }:
+
+pkgs.emacsPackages.melpaPackages.telega.overrideAttrs(old: {
+  patches = [];
+})
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index f094600ebf19..3ddae4fa6afb 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -14,7 +14,7 @@ let
   emacsWithPackages = (pkgs.emacsPackagesGen emacs).emacsWithPackages;
 
   # $PATH for binaries that need to be available to Emacs
-  emacsBinPath = lib.makeBinPath [ pkgs.emacsPackages.telega ];
+  emacsBinPath = lib.makeBinPath [ pkgs.emacsPackages.tvlPackages.telega ];
 
   identity = x: x;
 
@@ -110,6 +110,7 @@ let
 
     # patched / overridden versions of packages
     rcirc
+    telega
   ]))));
 in lib.fix(self: l: f: pkgs.writeShellScriptBin "tazjins-emacs" ''
   export PATH="${emacsBinPath}:$PATH"