From 885b6d9bb82539a66b3cc12ef3f04dd699d71294 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 1 Sep 2021 13:07:11 +0300
Subject: [PATCH] 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>
---
 third_party/notmuch/default.nix                            | 7 -------
 .../patches/notmuch-dottime.patch}                         | 0
 third_party/overlays/tvl.nix                               | 5 ++---
 users/tazjin/emacs/default.nix                             | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 third_party/notmuch/default.nix
 rename third_party/{notmuch/dottime.patch => overlays/patches/notmuch-dottime.patch} (100%)

diff --git a/third_party/notmuch/default.nix b/third_party/notmuch/default.nix
deleted file mode 100644
index 906608372..000000000
--- a/third_party/notmuch/default.nix
+++ /dev/null
@@ -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 []);
-})
diff --git a/third_party/notmuch/dottime.patch b/third_party/overlays/patches/notmuch-dottime.patch
similarity index 100%
rename from third_party/notmuch/dottime.patch
rename to third_party/overlays/patches/notmuch-dottime.patch
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 7c7c8ea06..d33f44616 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -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 ];
     };
   });
 }
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 92451d139..79a13ba41 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -57,7 +57,7 @@ let
     multiple-cursors
     nginx-mode
     nix-mode
-    notmuch # this comes from pkgs.third_party
+    notmuch
     paredit
     password-store
     pinentry