From f4940c881402caefa9fec0c6ff01e78d1427a8ac Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Feb 2025 18:14:46 -0500
Subject: [PATCH 1/3] fastjet: fix compilation

---
 pkgs/by-name/fa/fastjet/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/fa/fastjet/package.nix b/pkgs/by-name/fa/fastjet/package.nix
index f64e8acad983..4ca40d8af55d 100644
--- a/pkgs/by-name/fa/fastjet/package.nix
+++ b/pkgs/by-name/fa/fastjet/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   python ? null,
   withPython ? false,
 }:
@@ -15,6 +16,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-zBdUcb+rhla4xhg6jl6a0F1fdQbkbzISqagjCQW49qM=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.com/fastjet/fastjet/-/commit/57ff0184c7cf578bbcdee3667aeaa64288cbae1a.diff";
+      hash = "sha256-uz8q7s+YAmbB4oXB+wyaSLo4gWSbEEPdATGDBrxT0vg=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs --build fastjet-config.in
   '';

From 4c6997c57956ed47cca3138edffaf778527806b5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 14 Feb 2025 07:35:17 -0500
Subject: [PATCH 2/3] python312Packages.fastjet: fix dependencies

---
 pkgs/development/python-modules/fastjet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix
index 6b57b4a8f031..2fdac2219cd5 100644
--- a/pkgs/development/python-modules/fastjet/default.nix
+++ b/pkgs/development/python-modules/fastjet/default.nix
@@ -63,7 +63,10 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    awkward
     fastjet
+    numpy
+    vector
   ];
 
   buildInputs = [
@@ -73,9 +76,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    awkward
-    numpy
-    vector
   ];
 
   env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

From d9ada6e386a584d6ce9686f94231fdae452585b0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 14 Feb 2025 07:35:35 -0500
Subject: [PATCH 3/3] fastjet-contrib: fix soname

---
 pkgs/by-name/fa/fastjet-contrib/package.nix         | 2 ++
 pkgs/development/python-modules/fastjet/default.nix | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix
index 02f4c55d215c..caab082a4e3d 100644
--- a/pkgs/by-name/fa/fastjet-contrib/package.nix
+++ b/pkgs/by-name/fa/fastjet-contrib/package.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
       substituteInPlace "$f" --replace-quiet "ranlib " "${stdenv.cc.targetPrefix}ranlib "
     done
     patchShebangs --build ./utils/check.sh ./utils/install-sh
+    substituteInPlace configure \
+      --replace-warn "-Wl,-soname,fastjetcontribfragile.so.0" "-Wl,-soname,libfastjetcontribfragile.so"
   '';
 
   # Written in shell manually, does not support autoconf-style
diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix
index 2fdac2219cd5..54ebfea342a6 100644
--- a/pkgs/development/python-modules/fastjet/default.nix
+++ b/pkgs/development/python-modules/fastjet/default.nix
@@ -86,7 +86,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/scikit-hep/fastjet/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
-    # ImportError: fastjetcontribfragile.so.0: cannot open shared object file: No such file or directory
-    broken = true;
   };
 }