diff mbox series

[bug#64081,v2,1/2] gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'.

Message ID b9fbbb1604d59db15fbe9476856d25dc6ac87892.1687296647.git.ludo@gnu.org
State New
Headers show
Series [bug#64081,v2,1/2] gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'. | expand

Commit Message

Ludovic Courtès June 20, 2023, 9:31 p.m. UTC 
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(-)


base-commit: bb09f3ac002a4f34177d42fd3ea0332f4b7fe7a6
diff mbox series

Patch

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.