From 055ffe5e35cc23e43d938050a36f299c2cb84ac5 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Thu, 6 Apr 2023 23:48:14 -0700
Subject: [PATCH] notmuch: move gmime==3 constraint into the package

Using a top-level/all-packages.nix override to select the version is
confusing, and circumvents user overlays.
---
 .../applications/networking/mailreaders/notmuch/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                             | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index d7de9e971ea3..3dccf614fb96 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, lib, stdenv
 , pkg-config, gnupg
-, xapian, gmime, talloc, zlib
+, xapian, gmime3, talloc, zlib
 , doxygen, perl, texinfo
 , notmuch
 , pythonPackages
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gnupg                     # undefined dependencies
-    xapian gmime talloc zlib  # dependencies described in INSTALL
+    xapian gmime3 talloc zlib  # dependencies described in INSTALL
     perl
     pythonPackages.python
   ] ++ lib.optional withRuby ruby;
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     ln -s ${test-database} test/test-databases/database-v1.tar.xz
   '';
 
-  doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");
+  doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");
   checkTarget = "test";
   nativeCheckInputs = [
     which dtach openssl bash
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 781d5efafc71..c0e6bd63b10a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32601,7 +32601,6 @@ with pkgs;
   notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
-    gmime = gmime3;
     pythonPackages = python3Packages;
   };