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

fix(tools/emacs): Use explicit includes

Browse source
This commit is contained in:
Vincent Ambo 2020-05-22 19:05:39 +01:00
parent fe7fb8eff4
commit c08886ab82
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/emacs/default.nix
View file

@ -7,13 +7,11 @@
# 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, ... }: { depot, lib, ... }:
with depot;
with third_party.emacsPackages;
with third_party.emacs;
let let
inherit (depot) third_party;
emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs26).emacsWithPackages; emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs26).emacsWithPackages;
# $PATH for binaries that need to be available to Emacs # $PATH for binaries that need to be available to Emacs
@ -26,9 +24,11 @@ let
(with epkgs.elpaPackages; [ (with epkgs.elpaPackages; [
ace-window ace-window
avy avy
flymake
pinentry pinentry
rainbow-mode rainbow-mode
undo-tree undo-tree
xelb
]) ++ ]) ++
# MELPA packages: # MELPA packages:
@ -47,7 +47,6 @@ let
elixir-mode elixir-mode
elm-mode elm-mode
erlang erlang
flymake
geiser geiser
go-mode go-mode
gruber-darker-theme gruber-darker-theme
@ -97,14 +96,12 @@ let
web-mode web-mode
websocket websocket
which-key which-key
xelb
yaml-mode yaml-mode
yasnippet yasnippet
]) ++ ]) ++
# Custom packages # Custom packages
(with depot.tools.emacs-pkgs; [ (with depot.tools.emacs-pkgs; [
carp-mode
dottime dottime
nix-util nix-util
term-switcher term-switcher