[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/17: gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'.
From: |
guix-commits |
Subject: |
04/17: gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'. |
Date: |
Sat, 24 Jun 2023 11:08:59 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 9a86e2e97fd91003ee089dc0fed35d848e84d0f1
Author: Ludovic Courtès <ludovic.courtes@inria.fr>
AuthorDate: Thu Jun 15 16:59:23 2023 +0200
gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'.
* 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 @@ user interface to the FEniCS core components and external
libraries.")
("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 @@ user interface to the FEniCS core components and external
libraries.")
(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.
- branch master updated (d6dc82e8cd -> d3f5c35e40), guix-commits, 2023/06/24
- 03/17: doc: Turn "Creating a Channel" into a step-by-step guide., guix-commits, 2023/06/24
- 01/17: services: dicod: Use one inetd endpoint per interface., guix-commits, 2023/06/24
- 02/17: linux-container: Pass '--disable-chroot' to 'guix-daemon'., guix-commits, 2023/06/24
- 06/17: gnu: ruby-mini-portile-2: Update to 2.8.2., guix-commits, 2023/06/24
- 04/17: gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'.,
guix-commits <=
- 05/17: gnu: fenics-dolfin, fenics: Remove input labels., guix-commits, 2023/06/24
- 07/17: gnu: ruby-nokogiri: Update to 1.15.2., guix-commits, 2023/06/24
- 11/17: gnu: Add subunit., guix-commits, 2023/06/24
- 13/17: gnu: Add yder., guix-commits, 2023/06/24
- 09/17: gnu: Add libansilove., guix-commits, 2023/06/24
- 12/17: gnu: Add orcania., guix-commits, 2023/06/24
- 08/17: gnu: dyninst: Fix runtime error with new glibc., guix-commits, 2023/06/24
- 10/17: gnu: Add ansilove., guix-commits, 2023/06/24
- 14/17: gnu: Add ulfius., guix-commits, 2023/06/24
- 16/17: gnu: Add le-biniou., guix-commits, 2023/06/24