about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2017-09-16 10:15:55 +0000
committerGitHub <noreply@github.com>2017-09-16 10:15:55 +0000
commit2d3886262ec6970e40d82286b2675c45d2e5b7ae (patch)
treee3d7187e84c7d7ffc161c44f2a5ef13dbe037ff9 /pkgs/top-level/all-packages.nix
parentf351ee7e9b1987a858608e9480052ab29703b0b8 (diff)
parentae86fddd95e5b616b52e1707f3a82ac33d445c25 (diff)
downloadnixlib-2d3886262ec6970e40d82286b2675c45d2e5b7ae.tar
nixlib-2d3886262ec6970e40d82286b2675c45d2e5b7ae.tar.gz
nixlib-2d3886262ec6970e40d82286b2675c45d2e5b7ae.tar.bz2
nixlib-2d3886262ec6970e40d82286b2675c45d2e5b7ae.tar.lz
nixlib-2d3886262ec6970e40d82286b2675c45d2e5b7ae.tar.xz
nixlib-2d3886262ec6970e40d82286b2675c45d2e5b7ae.tar.zst
nixlib-2d3886262ec6970e40d82286b2675c45d2e5b7ae.zip
Merge pull request #29439 from oxij/pkgs/notmuch-gmime-3
gmime3: init; notmuch: use gmime3
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3662baec6081..5bce9224b9dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8190,7 +8190,9 @@ with pkgs;
 
   glui = callPackage ../development/libraries/glui {};
 
-  gmime = callPackage ../development/libraries/gmime { };
+  gmime2 = callPackage ../development/libraries/gmime/2.nix { };
+  gmime3 = callPackage ../development/libraries/gmime/3.nix { };
+  gmime = gmime2;
 
   gmm = callPackage ../development/libraries/gmm { };
 
@@ -15585,7 +15587,9 @@ with pkgs;
 
   notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
 
-  notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
+  notmuch = callPackage ../applications/networking/mailreaders/notmuch {
+    gmime = gmime3;
+  };
 
   notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { };