{yoda,lhapdf,fastnlo-toolkit}: fix and enable strictDeps (NixOS#366449)

SherfeyInv · Dec 20, 2024 · d3a91c2 · d3a91c2
2 parents 7db241f + 5b93a4e
commit d3a91c2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git 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;

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  bash,
   python,
   makeWrapper,
 }:
@@ -22,7 +23,10 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs =
-    [ makeWrapper ]
+    [
+      bash
+      makeWrapper
+    ]
     ++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [
       python.pkgs.cython
     ];
@@ -34,13 +38,16 @@ stdenv.mkDerivation rec {
     rm wrappers/python/lhapdf.cpp
   '';
 
+  strictDeps = true;
+
   enableParallelBuilding = true;
 
   passthru = {
     pdf_sets = import ./pdf_sets.nix { inherit lib stdenv fetchurl; };
   };
 
   postInstall = ''
+    patchShebangs --build $out/bin/lhapdf-config
     wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")"
   '';
 

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitLab,
   autoreconfHook,
+  bash,
   python,
   root,
   makeWrapper,
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = with python.pkgs; [
     autoreconfHook
+    bash
     cython
     makeWrapper
   ];
@@ -43,6 +45,8 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  strictDeps = true;
+
   enableParallelBuilding = true;
 
   postPatch = ''
@@ -54,6 +58,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
+    patchShebangs --build $out/bin/yoda-config
     for prog in "$out"/bin/*; do
       wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
     done