[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64081] [PATCH 1/2] gnu: fenics: Make sure 'jit.py' can find 'dolfin
From: |
Ludovic Courtès |
Subject: |
[bug#64081] [PATCH 1/2] gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'. |
Date: |
Thu, 15 Jun 2023 17:35:30 +0200 |
From: Ludovic Courtès <ludovic.courtes@inria.fr>
* gnu/packages/simulation.scm (fenics)[inputs]: Move PYTHON-PKGCONFIG
to...
[propagated-inputs]: ... here.
[arguments]: Add 'set-dolfin-pc-file-name' phase.
---
gnu/packages/simulation.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 059be5a2be..9eeb57babe 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -716,12 +716,14 @@ (define-public fenics
("ply" ,python-ply)
("pytest" ,python-pytest)
("python-decorator" ,python-decorator)
- ("python-pkgconfig" ,python-pkgconfig)
,@(package-native-inputs fenics-dolfin)))
(propagated-inputs
`(("dolfin" ,fenics-dolfin)
("petsc4py" ,python-petsc4py)
- ("slepc4py" ,python-slepc4py)))
+ ("slepc4py" ,python-slepc4py)
+
+ ;; 'dolfin/jit/jit.py' parses 'dolfin.pc' at run time.
+ ("python-pkgconfig" ,python-pkgconfig)))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -729,6 +731,15 @@ (define-public fenics
(lambda _
(substitute* "python/setup.py"
(("pybind11==") "pybind11>="))))
+ (add-after 'unpack 'set-dolfin-pc-file-name
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Instead of cluttering the user's 'PKG_CONFIG_PATH' environment
+ ;; variable, hard-code the 'dolfin.pc' absolute file name.
+ (let ((pc-file (search-input-file inputs
+ "/lib/pkgconfig/dolfin.pc")))
+ (substitute* "python/dolfin/jit/jit.py"
+ (("pkgconfig\\.parse\\(\"dolfin\"\\)")
+ (string-append "pkgconfig.parse(\"" pc-file "\")"))))))
(add-after 'patch-source-shebangs 'set-paths
(lambda _
;; Define paths to store locations.
base-commit: 26602f4063a6e0c626e8deb3423166bcd0abeb90
--
2.40.1
- [bug#64081] [PATCH 1/2] gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'.,
Ludovic Courtès <=