From f01beefa3d3da9c1ea06947f0731166f9cda1ad9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 11:55:38 +0100 Subject: [PATCH] fastjet-contrib: fix cross build --- pkgs/by-name/fa/fastjet-contrib/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix index 4bb49c711d58..5e39dcb3b8fc 100644 --- a/pkgs/by-name/fa/fastjet-contrib/package.nix +++ b/pkgs/by-name/fa/fastjet-contrib/package.nix @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ fastjet ]; postPatch = '' - for f in Makefile.in */Makefile; do + for f in Makefile.in */Makefile scripts/internal/Template/Makefile; do substituteInPlace "$f" --replace "CXX=g++" "" + substituteInPlace "$f" --replace-quiet "ar " "${stdenv.cc.targetPrefix}ar " + substituteInPlace "$f" --replace-quiet "ranlib " "${stdenv.cc.targetPrefix}ranlib " done - patchShebangs ./utils/check.sh ./utils/install-sh + patchShebangs --build ./utils/check.sh ./utils/install-sh ''; # Written in shell manually, does not support autoconf-style @@ -28,6 +30,10 @@ stdenv.mkDerivation rec { # Error: --build=x86_64-unknown-linux-gnu: unrecognised argument configurePlatforms = [ ]; + configureFlags = [ + "--fastjet-config=${lib.getExe' (lib.getDev fastjet) "fastjet-config"}" + ]; + enableParallelBuilding = true; doCheck = true;