From 2da0f2828b5ef58b87eb0f4aed942748e6682f2f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 18 Mar 2022 12:46:58 +0100
Subject: gnu: petsc-openmpi: Remove input labels.

* gnu/packages/maths.scm (petsc-openmpi)[inputs]: Use 'modify-inputs'.
[arguments]: Adjust label name for hdf5.
---
 gnu/packages/maths.scm | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8e287a8055..ecb85642ec 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3085,15 +3085,15 @@ scientific applications modeled by partial differential equations.")
     (inherit petsc)
     (name "petsc-openmpi")
     (inputs
-     `(("hdf5" ,hdf5-parallel-openmpi)
-       ("hypre" ,hypre-openmpi)
-       ("metis" ,metis)
-       ("mumps" ,mumps-openmpi)
-       ("openmpi" ,openmpi)
-       ("scalapack" ,scalapack)
-       ("scotch" ,pt-scotch32)
-       ("scotch" ,pt-scotch32 "metis")
-       ,@(package-inputs petsc)))
+     (modify-inputs (package-inputs petsc)
+       (prepend hdf5-parallel-openmpi
+                hypre-openmpi
+                metis
+                mumps-openmpi
+                openmpi
+                scalapack
+                pt-scotch32
+                `(,pt-scotch32 "metis"))))
     (arguments
      (substitute-keyword-arguments (package-arguments petsc)
        ((#:configure-flags cf)
@@ -3106,9 +3106,11 @@ scientific applications modeled by partial differential equations.")
             ,(string-append "--with-mpi-dir="
                             #$(this-package-input "openmpi"))
             ,(string-append "--with-hdf5-include="
-                            #$(this-package-input "hdf5") "/include")
+                            #$(this-package-input "hdf5-parallel-openmpi")
+                            "/include")
             ,(string-append "--with-hdf5-lib="
-                            #$(this-package-input "hdf5") "/lib/libhdf5.a")
+                            #$(this-package-input "hdf5-parallel-openmpi")
+                            "/lib/libhdf5.a")
             ,@(delete "--with-mpi=0" #$cf)))
        ((#:phases phases)
         #~(modify-phases #$phases
-- 
cgit v1.2.3