summary refs log tree commit diff
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2022-05-18 14:40:35 -0400
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2022-05-18 14:40:35 -0400
commit588d62e2d410716769d08358e7fe20b537bd626b (patch)
tree012991a31d984434bef8c814aa965f2b0abe0cc3
parente7d67d857632b609b4cf33b9a213d2af224f47db (diff)
downloadnixpkgs-588d62e2d410716769d08358e7fe20b537bd626b.tar
nixpkgs-588d62e2d410716769d08358e7fe20b537bd626b.tar.gz
nixpkgs-588d62e2d410716769d08358e7fe20b537bd626b.tar.bz2
nixpkgs-588d62e2d410716769d08358e7fe20b537bd626b.tar.lz
nixpkgs-588d62e2d410716769d08358e7fe20b537bd626b.tar.xz
nixpkgs-588d62e2d410716769d08358e7fe20b537bd626b.tar.zst
nixpkgs-588d62e2d410716769d08358e7fe20b537bd626b.zip
mcfm: fix gcc-flavored lhapdf for darwin
An updated LHAPDF picks up CoreFoundation from `python-config --libs`,
which isn't present in gccStdenv.
-rw-r--r--pkgs/development/libraries/physics/lhapdf/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix2
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 { };