fastjet: fix compilation (#381893)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user