about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--third_party/telega/default.nix21
-rw-r--r--users/tazjin/emacs/default.nix8
2 files changed, 5 insertions, 24 deletions
diff --git a/third_party/telega/default.nix b/third_party/telega/default.nix
deleted file mode 100644
index 7eda244b7fac..000000000000
--- a/third_party/telega/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# Pin a working combination of telega.el & tdlib, as these are totally
-# out-of-sync in nixpkgs.
-{ pkgs, ... }:
-
-let
-  tdlib = pkgs.originals.tdlib.overrideAttrs(old: {
-    version = "1.6.6";
-    src = pkgs.fetchFromGitHub {
-      owner = "tdlib";
-      repo = "td";
-      rev = "c78fbe4bc5e31395e08f916816704e8051f27296"; # 1.6.6
-      sha256 = "18ny990cvnwj5sd5jp49n0jn8b8fa8iszw4vxvsqdnw00srw0ggd";
-    };
-  });
-# Emacs packages use some sort of fixed point override scheme and
-# don't expose individual overrides in the override-functor, hence the
-# mess below.
-in pkgs.originals.telega.overrideAttrs(old: {
-  buildInputs = [ tdlib ] ++
-    (builtins.filter (p: !(p ? pname) || p.pname != "tdlib") old.buildInputs);
-})
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 527f0079b2ef..c7f0f8c03dc9 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -7,7 +7,7 @@
 # Forcing Emacs to link against Imagemagick currently causes libvterm
 # to segfault, which is a lot less desirable than not having telega
 # render images correctly.
-{ depot, lib, ... }:
+{ depot, lib, pkgs, ... }:
 
 let
   inherit (depot) third_party;
@@ -15,7 +15,7 @@ let
   emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs27).emacsWithPackages;
 
   # $PATH for binaries that need to be available to Emacs
-  emacsBinPath = lib.makeBinPath [ third_party.telega ];
+  emacsBinPath = lib.makeBinPath [ third_party.emacsPackages.telega ];
 
   identity = x: x;
 
@@ -100,8 +100,10 @@ let
     term-switcher
     tvl
 
+    # telega comes from a mysterious third package set
+    pkgs.emacsPackages.telega
+
     # patched / overridden versions of packages
-    depot.third_party.telega
     depot.third_party.emacs.exwm
     depot.third_party.emacs.rcirc
     depot.third_party.emacs.vterm