From e4879983d411a26309c71b47c88dcd1290e6c426 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 6 Dec 2023 20:34:39 -0500
Subject: [PATCH 1/2] clhep: bump to 2.4.7.1

---
 overlay.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/overlay.nix b/overlay.nix
index 87acaf5..ecc3513 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -22,6 +22,18 @@ final: prev: with final; {
 
   athena = callPackage pkgs/athena {};
 
+  # geant4 requires at least version 2.4.6.0
+  clhep = prev.clhep.overrideAttrs (old:
+    final.lib.optionalAttrs (final.lib.versionOlder prev.clhep.version "2.4.7.1") rec {
+      version = "2.4.7.1";
+
+      src = fetchurl {
+        url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";
+        hash = "sha256-HIMEp3cqxrmRlfEwA3jG4930rQfIXWSgRQVlKruKVfk=";
+      };
+    }
+  );
+
   epic = callPackage pkgs/epic { inherit epic-src; };
 
   edm4eic = callPackage pkgs/edm4eic { inherit edm4eic-src; };

From 9cb7e4cfd594ff7e4c322d143db869ce212b8ace Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 4 Dec 2023 20:10:55 -0500
Subject: [PATCH 2/2] geant4: bump to 11.1.3

---
 overlay.nix              | 11 ++++++++++-
 pkgs/fun4all/default.nix |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index ecc3513..959d325 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -67,7 +67,16 @@ final: prev: with final; {
 
   geant4 = (prev.geant4.override {
     enableQt = true;
-  }).overrideAttrs (prev: {
+  }).overrideAttrs (prev: rec {
+    version = "11.1.3";
+    src = fetchurl {
+      url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz";
+      hash = "sha256-TF++pnidjWGe2sygYx1rUhGmDhv5l0w9P6ue+eImkvU=";
+    };
+    postPatch = ''
+      substituteInPlace source/externals/ptl/cmake/Modules/PTLPackageConfigHelpers.cmake \
+        --replace '${"$"}{prefix}/${"$"}{PTL_INSTALL_' '${"$"}{PTL_INSTALL_'
+    '';
     cmakeFlags = prev.cmakeFlags ++ [
       "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
     ];
diff --git a/pkgs/fun4all/default.nix b/pkgs/fun4all/default.nix
index ad4184b..ae6259d 100644
--- a/pkgs/fun4all/default.nix
+++ b/pkgs/fun4all/default.nix
@@ -198,7 +198,7 @@ let
         hash = "sha256-7Nrb+EaAevi6oHHzgQT7DcwkhHyEdc2DlzAuKu+o9m8=";
       };
 
-      postPatch = (prev.postPatch or "") + ''
+      postPatch = (builtins.replaceStrings ["substituteInPlace source/externals/ptl/cmake/Modules/PTLPackageConfigHelpers.cmake"] ["echo"] prev.postPatch or "") + ''
         substituteInPlace cmake/Modules/FindXQuartzGL.cmake \
           --replace "NO_DEFAULT_PATH" ""