mcfm: fix gcc-flavored lhapdf for darwin
An updated LHAPDF picks up CoreFoundation from `python-config --libs`, which isn't present in gccStdenv.
This commit is contained in:
parent
e7d67d8576
commit
588d62e2d4
|
@ -16,10 +16,12 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ lib.optionals (lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ];
|
||||
++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ];
|
||||
buildInputs = [ python ];
|
||||
|
||||
preBuild = lib.optionalString (lib.versionAtLeast python.version "3.10") ''
|
||||
configureFlags = lib.optionals (python == null) [ "--disable-python" ];
|
||||
|
||||
preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") ''
|
||||
rm wrappers/python/lhapdf.cpp
|
||||
'';
|
||||
|
||||
|
|
|
@ -33164,7 +33164,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 { };
|
||||
|
|
Loading…
Reference in a new issue