From 5b93a4e3759db4699c15ccbd4cef636017a95840 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 19 Dec 2024 08:46:54 +0100 Subject: [PATCH] fastnlo-toolkit: fix and enable strictDeps Also remove the currently unused gfortran inputs. Co-Authored-By: veprbl --- pkgs/by-name/fa/fastnlo-toolkit/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/fastnlo-toolkit/package.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix index d43cc2698c1b..77c605f5d363 100644 --- a/pkgs/by-name/fa/fastnlo-toolkit/package.nix +++ b/pkgs/by-name/fa/fastnlo-toolkit/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, boost, - gfortran, lhapdf, ncurses, perl, @@ -35,23 +34,26 @@ stdenv.mkDerivation rec { ./yoda2_support.patch ]; + nativeBuildInputs = [ + lhapdf # lhapdf-config + yoda # yoda-config + ] ++ lib.optional withPython python; + buildInputs = [ boost - gfortran - gfortran.cc.lib lhapdf yoda ] ++ lib.optional withPython python ++ lib.optional (withPython && python.isPy3k) ncurses; + propagatedNativeBuildInputs = lib.optional withPython [ swig ]; propagatedBuildInputs = [ zlib ] ++ lib.optional withPython [ - swig python.pkgs.distutils ]; @@ -68,6 +70,8 @@ stdenv.mkDerivation rec { "--with-yoda=${yoda}" ] ++ lib.optional withPython "--enable-pyext"; + strictDeps = true; + enableParallelBuilding = true; doCheck = true;