mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tazjin/emacs): Use telega from nixpkgs

Browse source 
adisbladis fixed the tdlib/telega versioning issues in nixpkgs at some
point, so this isn't required anymore.

Change-Id: Ib98e73d0e4394765f08f5f3741f70adab459c22f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2909
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Vincent Ambo 2021-04-10 00:12:52 +02:00 committed by tazjin
parent d8ec573bc7
commit a83abc9024
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
third_party/telega/default.nix vendored
View file

@ -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);
})

8
users/tazjin/emacs/default.nix
View file

@ -7,7 +7,7 @@
# Forcing Emacs to link against Imagemagick currently causes libvterm # Forcing Emacs to link against Imagemagick currently causes libvterm
# to segfault, which is a lot less desirable than not having telega # to segfault, which is a lot less desirable than not having telega
# render images correctly. # render images correctly.
{ depot, lib, ... }: { depot, lib, pkgs, ... }:
let let
inherit (depot) third_party; inherit (depot) third_party;
@ -15,7 +15,7 @@ let
emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs27).emacsWithPackages; emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs27).emacsWithPackages;
# $PATH for binaries that need to be available to Emacs # $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; identity = x: x;
@ -100,8 +100,10 @@ let
term-switcher term-switcher
tvl tvl
# telega comes from a mysterious third package set
pkgs.emacsPackages.telega
# patched / overridden versions of packages # patched / overridden versions of packages
depot.third_party.telega
depot.third_party.emacs.exwm depot.third_party.emacs.exwm
depot.third_party.emacs.rcirc depot.third_party.emacs.rcirc
depot.third_party.emacs.vterm depot.third_party.emacs.vterm