refactor(3p/notmuch): Simplify setup

The backported fix is no longer required and we can just apply the
patch in the overlay, this makes everything a little easier.

Change-Id: I654a1bb002eef5c578b8e576e133a159bde3f850
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3483
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-09-01 13:07:11 +03:00 committed by tazjin
parent 0dbad73ff1
commit 885b6d9bb8
4 changed files with 3 additions and 11 deletions

View file

@ -1,7 +0,0 @@
# Notmuch, but with support for https://dotti.me/
{ pkgs, ... }:
pkgs.notmuch.overrideAttrs(old: {
doCheck = false;
patches = [ ./dottime.patch ] ++ (if old ? patches then old.patches else []);
})

View file

@ -29,11 +29,10 @@ self: super: {
})
);
# Temporary fix for python3Packages.notmuch
# See https://github.com/NixOS/nixpkgs/pull/132592/
# dottime support for notmuch
notmuch = super.notmuch.overrideAttrs(old: {
passthru = old.passthru // {
pythonSourceRoot = "notmuch-${old.version}/bindings/python";
patches = old.patches ++ [ ./patches/notmuch-dottime.patch ];
};
});
}

View file

@ -57,7 +57,7 @@ let
multiple-cursors
nginx-mode
nix-mode
notmuch # this comes from pkgs.third_party
notmuch
paredit
password-store
pinentry