From 0f3d4eb551c2fb3b69f3f3ecbdfda33c12d4e5e8 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 24 Aug 2018 14:26:12 -0400 Subject: [PATCH] [emacs] add borg-nix-shell and use it to build notmuch's build deps - currently only works in regular emacs session and not via terminal: https://github.com/emacscollective/borg/issues/78 - TODO: add support for guix environment --- .gitmodules | 4 ++++ init.org | 3 +++ lib/borg-nix-shell | 1 + 3 files changed, 8 insertions(+) create mode 160000 lib/borg-nix-shell diff --git a/.gitmodules b/.gitmodules index 6f90e8d..e5a4bb5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,6 +16,9 @@ [submodule "borg"] path = lib/borg url = git@github.com:emacscollective/borg.git +[submodule "borg-nix-shell"] + path = lib/borg-nix-shell + url = git@github.com:thblt/borg-nix-shell.git [submodule "closql"] path = lib/closql url = git@github.com:emacscollective/closql.git @@ -130,6 +133,7 @@ url = https://git.notmuchmail.org/git/notmuch load-path = emacs info-path = doc/_build/texinfo + build-nix-shell-packages = pkgconfig gitMinimal xapian gmime talloc zlib pythonPackages.sphinx pythonPackages.python texinfo build-step = ./configure build-step = make build-step = make sphinx-texinfo diff --git a/init.org b/init.org index e1a6686..51cd9ca 100644 --- a/init.org +++ b/init.org @@ -234,6 +234,9 @@ can then be managed with the help of Magit or other tools. (require 'borg) (borg-initialize) +(require 'borg-nix-shell) +(setq borg-build-shell-command 'borg-nix-shell-build-command) + (with-eval-after-load 'bind-key (bind-keys :package borg diff --git a/lib/borg-nix-shell b/lib/borg-nix-shell new file mode 160000 index 0000000..84dac9e --- /dev/null +++ b/lib/borg-nix-shell @@ -0,0 +1 @@ +Subproject commit 84dac9e821ea445a6b4542d021d3094b0c1e55d3 -- 2.20.1