From 588d62e2d410716769d08358e7fe20b537bd626b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 18 May 2022 14:40:35 -0400 Subject: mcfm: fix gcc-flavored lhapdf for darwin An updated LHAPDF picks up CoreFoundation from `python-config --libs`, which isn't present in gccStdenv. --- pkgs/development/libraries/physics/lhapdf/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index c31d9794407..991309b54d4 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03b807a0686..9b3cef9a6b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; -- cgit 1.4.1