From 373a013cab50605fe0dc8c3dab5c46e09fc9aa26 Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Thu, 20 Oct 2022 19:44:28 +0200
Subject: [PATCH] claws-mail: 4.1.0 -> 4.1.1

- The Perl fix is now upstream and could be removed.
- A new mechanism to determine the version requires git and other tools
  and can easily be replaced by the already known version.

https://git.claws-mail.org/?p=claws.git;a=blob_plain;f=RELEASE_NOTES;hb=c8ddd32fa2c9bb9e61a34a3550d72cd67b36da21
---
 .../networking/mailreaders/claws-mail/default.nix     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 1e47c68526ad..f896cc43867c 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -98,22 +98,17 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "claws-mail";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    hash = "sha256-DhqcoNuNKp4FiuMM3H/JGXeSFOw8Vu4Min+IzCOBeo4=";
+    hash = "sha256-sYnnAMGJb14N6wt21L+oIOt6wZNe4Qqpr7raPPU6A0Q=";
   };
 
   outputs = [ "out" "dev" ];
 
   patches = [
     ./mime.patch
-    # fix build with perl 5.36+
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/claws-mail/trunk/20cope_with_fix_for_1009149.patch";
-      hash = "sha256-/WBslmoFvja2v2GEBntxvNtG0I3xtkUUqXO5gl5pqqs=";
-    })
   ];
 
   preConfigure = ''
@@ -124,6 +119,8 @@ in stdenv.mkDerivation rec {
   '';
 
   postPatch = ''
+    substituteInPlace configure.ac \
+      --replace 'm4_esyscmd([./get-git-version])' '${version}'
     substituteInPlace src/procmime.c \
         --subst-var-by MIMEROOTDIR ${shared-mime-info}/share
   '';