tblite: fix python module

+67 -6
+31
pkgs/development/libraries/science/chemistry/tblite/0001-fix-multicharge-dep-needed-for-static-compilation.patch
··· 1 + From 1885a2349102742e33c5c97a8ab4bcacc032fc70 Mon Sep 17 00:00:00 2001 2 + From: Ryan Swart <ryan@talosystems.com> 3 + Date: Thu, 30 Mar 2023 15:50:23 +0800 4 + Subject: [PATCH] fix: multicharge dep needed for static compilation 5 + 6 + --- 7 + config/meson.build | 8 ++++++++ 8 + 1 file changed, 8 insertions(+) 9 + 10 + diff --git a/config/meson.build b/config/meson.build 11 + index 4f76160..629fa5e 100644 12 + --- a/config/meson.build 13 + +++ b/config/meson.build 14 + @@ -136,6 +136,14 @@ sdftd3_dep = dependency( 15 + ) 16 + lib_deps += sdftd3_dep 17 + 18 + +# Create multicharge library as subproject 19 + +multicharge_dep = dependency( 20 + + 'multicharge', 21 + + fallback: ['multicharge'], 22 + + default_options: ['default_library=static', 'api=false', 'python=false'], 23 + +) 24 + +lib_deps += multicharge_dep 25 + + 26 + # Create TOML Fortran as subproject 27 + tomlf_dep = dependency( 28 + 'toml-f', 29 + -- 30 + 2.39.2 31 +
+36 -6
pkgs/development/libraries/science/chemistry/tblite/python.nix
··· 3 3 , ninja 4 4 , pkg-config 5 5 , tblite 6 + , numpy 7 + , simple-dftd3 6 8 , cffi 9 + , gfortran 10 + , blas 11 + , lapack 12 + , mctc-lib 13 + , mstore 14 + , toml-f 15 + , multicharge 16 + , dftd4 7 17 }: 8 18 9 - buildPythonPackage rec { 19 + buildPythonPackage { 10 20 inherit (tblite) pname version src meta; 11 21 12 - nativeBuildInputs = [ meson ninja pkg-config ]; 22 + nativeBuildInputs = [ 23 + tblite 24 + meson 25 + ninja 26 + pkg-config 27 + gfortran 28 + mctc-lib 29 + ]; 13 30 14 - buildInputs = [ tblite ]; 31 + buildInputs = [ 32 + tblite 33 + simple-dftd3 34 + blas 35 + lapack 36 + mctc-lib 37 + mstore 38 + toml-f 39 + multicharge 40 + dftd4 41 + ]; 15 42 16 - propagatedBuildInputs = [ cffi ]; 43 + propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ]; 17 44 18 - format = "other"; 45 + # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors 46 + patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ]; 19 47 48 + format = "other"; 49 + pythonImportsCheck = [ "tblite" "tblite.interface" ]; 20 50 configurePhase = '' 21 51 runHook preConfigure 22 52 23 - meson setup build python --prefix=$out 53 + meson setup build -Dpython=true --prefix=$out 24 54 cd build 25 55 26 56 runHook postConfigure