about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/notmuch/default.nix7
-rw-r--r--third_party/overlays/patches/notmuch-dottime.patch (renamed from third_party/notmuch/dottime.patch)0
-rw-r--r--third_party/overlays/tvl.nix5
3 files changed, 2 insertions, 10 deletions
diff --git a/third_party/notmuch/default.nix b/third_party/notmuch/default.nix
deleted file mode 100644
index 90660837266d..000000000000
--- 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
index 7a9cfc6cc2a9..7a9cfc6cc2a9 100644
--- a/third_party/notmuch/dottime.patch
+++ b/third_party/overlays/patches/notmuch-dottime.patch
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 7c7c8ea06a43..d33f4461687a 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 ];
     };
   });
 }