b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mcfm: fix gcc-flavored lhapdf for darwin

Browse source 
An updated LHAPDF picks up CoreFoundation from `python-config --libs`,
which isn't present in gccStdenv.
This commit is contained in:
Dmitry Kalinkin 2022-05-18 14:40:35 -04:00
parent e7d67d8576
commit 588d62e2d4
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/physics/lhapdf/default.nix
View file

@ -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
'';

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };