diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index a3753d86356e..991309b54d46 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.4.0"; + version = "6.5.1"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-fS8CZ+LWWw3e4EhVOzQtfIk6bbq+HjJsrWLeABDdgQw="; + sha256 = "sha256-ElZBniIn0aT5M4f+HagF5kg1FBfTdV6K9aMKNaamZ1E="; }; # The Apple SDK only exports locale_t from xlocale.h whereas glibc @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { substituteInPlace src/GridPDF.cc --replace '#include ' '#include ' ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ]; buildInputs = [ python ]; + configureFlags = lib.optionals (python == null) [ "--disable-python" ]; + + preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") '' + rm wrappers/python/lhapdf.cpp + ''; + enableParallelBuilding = true; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a32a9cad0e6e..bf3dc006a77c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33191,7 +33191,7 @@ with pkgs; mcfm = callPackage ../applications/science/physics/MCFM { stdenv = gccStdenv; - lhapdf = lhapdf.override { stdenv = gccStdenv; }; + lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; }; }; nnpdf = callPackage ../applications/science/physics/nnpdf { };