🐛 fix emacssql not compiling

nixos
Moritz Böhme 2022-04-18 12:19:41 +02:00
parent fd7c3a9ea2
commit 26a7df41d8
No known key found for this signature in database
GPG Key ID: 213820E2795F5CF5
1 changed files with 6 additions and 14 deletions

View File

@ -2,9 +2,8 @@
with lib; with lib;
let let
emacs = with pkgs; myEmacs = with pkgs;
((emacsPackagesFor emacsGcc).emacsWithPackages ((emacsPackagesFor emacsGcc).emacsWithPackages (epkgs: [ epkgs.vterm ]));
(epkgs: [ epkgs.vterm epkgs.emacsql-sqlite3 ]));
cfg = config.modules.editors.emacs; cfg = config.modules.editors.emacs;
in { in {
options.modules.editors = { options.modules.editors = {
@ -21,13 +20,13 @@ in {
home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
services.emacs = { services.emacs = {
enable = true; enable = true;
package = emacs; package = myEmacs;
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
## Emacs itself ## Emacs itself
binutils # native-comp needs 'as', provided by this binutils # native-comp needs 'as', provided by this
emacs myEmacs
## Doom dependencies ## Doom dependencies
git git
@ -41,7 +40,6 @@ in {
## Module dependencies ## Module dependencies
# :checkers spell # :checkers spell
# (aspellWithDicts (ds: with ds; [ en en-computers en-science de ]))
(hunspellWithDicts [ (hunspellWithDicts [
hunspellDicts.en_GB-ize hunspellDicts.en_GB-ize
hunspellDicts.en_US hunspellDicts.en_US
@ -53,6 +51,8 @@ in {
# :tools lookup & :lang org +roam # :tools lookup & :lang org +roam
sqlite sqlite
gcc # HACK to get emacsqlite binary
wordnet wordnet
graphviz graphviz
@ -80,14 +80,6 @@ in {
# :email # :email
mu mu
isync isync
# :lang haskell
haskell-language-server
(haskellPackages.ghcWithPackages (p:
# general
[ p.brittany ] ++
# xmonad
[ p.xmonad p.xmonad-contrib p.xmonad-extras p.xmobar ]))
]; ];
}; };
}; };