tblite: fix python module
This commit is contained in:
parent
f1937c1749
commit
da5ce0a696
2 changed files with 67 additions and 6 deletions
|
@ -0,0 +1,31 @@
|
||||||
|
From 1885a2349102742e33c5c97a8ab4bcacc032fc70 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ryan Swart <ryan@talosystems.com>
|
||||||
|
Date: Thu, 30 Mar 2023 15:50:23 +0800
|
||||||
|
Subject: [PATCH] fix: multicharge dep needed for static compilation
|
||||||
|
|
||||||
|
---
|
||||||
|
config/meson.build | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config/meson.build b/config/meson.build
|
||||||
|
index 4f76160..629fa5e 100644
|
||||||
|
--- a/config/meson.build
|
||||||
|
+++ b/config/meson.build
|
||||||
|
@@ -136,6 +136,14 @@ sdftd3_dep = dependency(
|
||||||
|
)
|
||||||
|
lib_deps += sdftd3_dep
|
||||||
|
|
||||||
|
+# Create multicharge library as subproject
|
||||||
|
+multicharge_dep = dependency(
|
||||||
|
+ 'multicharge',
|
||||||
|
+ fallback: ['multicharge'],
|
||||||
|
+ default_options: ['default_library=static', 'api=false', 'python=false'],
|
||||||
|
+)
|
||||||
|
+lib_deps += multicharge_dep
|
||||||
|
+
|
||||||
|
# Create TOML Fortran as subproject
|
||||||
|
tomlf_dep = dependency(
|
||||||
|
'toml-f',
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
|
@ -3,24 +3,54 @@
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, tblite
|
, tblite
|
||||||
|
, numpy
|
||||||
|
, simple-dftd3
|
||||||
, cffi
|
, cffi
|
||||||
|
, gfortran
|
||||||
|
, blas
|
||||||
|
, lapack
|
||||||
|
, mctc-lib
|
||||||
|
, mstore
|
||||||
|
, toml-f
|
||||||
|
, multicharge
|
||||||
|
, dftd4
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage {
|
||||||
inherit (tblite) pname version src meta;
|
inherit (tblite) pname version src meta;
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
nativeBuildInputs = [
|
||||||
|
tblite
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
gfortran
|
||||||
|
mctc-lib
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ tblite ];
|
buildInputs = [
|
||||||
|
tblite
|
||||||
|
simple-dftd3
|
||||||
|
blas
|
||||||
|
lapack
|
||||||
|
mctc-lib
|
||||||
|
mstore
|
||||||
|
toml-f
|
||||||
|
multicharge
|
||||||
|
dftd4
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ cffi ];
|
propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ];
|
||||||
|
|
||||||
|
# Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors
|
||||||
|
patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ];
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
pythonImportsCheck = [ "tblite" "tblite.interface" ];
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
runHook preConfigure
|
runHook preConfigure
|
||||||
|
|
||||||
meson setup build python --prefix=$out
|
meson setup build -Dpython=true --prefix=$out
|
||||||
cd build
|
cd build
|
||||||
|
|
||||||
runHook postConfigure
|
runHook postConfigure
|
||||||
|
|
Loading…
Reference in a new issue