From a9ee60bb0f18e091179ae732978e8554650bb153 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 15 May 2024 01:38:34 -0400
Subject: [PATCH] eicrecon: add fastjet-contrib

---
 overlay.nix               |  6 ++++++
 pkgs/eicrecon/default.nix | 14 +++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index 921e7d4..60c8cfb 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -45,6 +45,12 @@ final: prev: with final; {
 
   eic-smear = callPackage pkgs/eic-smear {};
 
+  fastjet = prev.fastjet.overrideAttrs (prev: {
+    configureFlags = prev.configureFlags ++ [
+      "--enable-auto-ptr=no"
+    ];
+  });
+
   # Required by a recent EICrecon
   fmt = if final.lib.versionOlder prev.fmt.version "9" then fmt_9 else prev.fmt;
   # Also update an input hardcoded in nixpkgs' spdlog (it switched to fmt
diff --git a/pkgs/eicrecon/default.nix b/pkgs/eicrecon/default.nix
index 0e6b9fd..192597a 100644
--- a/pkgs/eicrecon/default.nix
+++ b/pkgs/eicrecon/default.nix
@@ -11,6 +11,7 @@
 , edm4hep
 , eigen
 , fastjet
+, fastjet-contrib
 , irt
 , jana2
 , microsoft_gsl
@@ -23,16 +24,6 @@
 , makeWrapper
 }:
 
-let
-
-  _fastjet = fastjet.overrideAttrs (prev: {
-    configureFlags = prev.configureFlags ++ [
-      "--enable-auto-ptr=no"
-    ];
-  });
-
-in
-
 stdenv.mkDerivation rec {
   pname = "EICrecon";
   version = "1.13.2.${eicrecon-src.shortRev or "dirty"}";
@@ -62,7 +53,8 @@ stdenv.mkDerivation rec {
     dd4hep
     edm4eic
     edm4hep
-    _fastjet
+    fastjet
+    fastjet-contrib
     eigen
     irt
     jana2