From 70d23ab6672b2146ba6da33a790445cd8fa4d6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Mon, 3 Mar 2025 14:19:39 +0100 Subject: [PATCH] notmuch: fix build with emacs30 --- .../networking/mailreaders/notmuch/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 90c0c98b400a..b46ba1ecdf27 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,5 @@ { + fetchpatch, fetchurl, lib, stdenv, @@ -67,6 +68,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withRuby ruby ++ lib.optional withSfsexp sfsexp; + patches = [ + (fetchpatch { + name = "add-workaround-for-Emacs-30-pp-changes.patch"; + url = "https://git.notmuchmail.org/git?p=notmuch;a=patch;h=e3d4721b1ba4836c7646e057b50123fe994652eb"; + hash = "sha256-phfNSOlTajTmaf+DjtdmBAWSm+2tUbrQEChInUlwn5k="; + }) + ]; + postPatch = '' patchShebangs configure test/