From 547f9bf973df9eaba3941cc19d0d149607cd6445 Mon Sep 17 00:00:00 2001
From: Luke Sandell <lasandell@gmail.com>
Date: Tue, 3 May 2022 21:52:06 -0500
Subject: [PATCH] xca: 2.2.1 -> 2.4.0

---
 pkgs/applications/misc/xca/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 9e05e09caefe..2a6bab5ebda7 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,25 +1,23 @@
-{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config
-, libtool, openssl, qtbase, qttools }:
+{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config
+, libtool, openssl, qtbase, qttools, sphinx }:
 
 mkDerivation rec {
   pname = "xca";
-  version = "2.2.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner  = "chris2511";
     repo   = "xca";
     rev    = "RELEASE.${version}";
-    sha256 = "0na2816lkfkkvssh9kmf5vwy6x8kd4x7h138jzy61wrvs69vhnbi";
+    sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk";
   };
 
-  postPatch = ''
-    substituteInPlace doc/code2html \
-      --replace /usr/bin/perl ${perl}/bin/perl
-  '';
-
   buildInputs = [ libtool openssl qtbase ];
 
-  nativeBuildInputs = [ autoreconfHook pkg-config qttools ];
+  nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ];
+
+  # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710)
+  QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
 
   enableParallelBuilding = true;