diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-03-18 12:46:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-03-18 16:03:32 +0100 |
| commit | 2da0f2828b5ef58b87eb0f4aed942748e6682f2f (patch) | |
| tree | 3dc6865de29be60cf5bbcbe632318d569c4fb99c | |
| parent | 5f83f9521048394fb2d07229754a39b951177c0f (diff) | |
| download | guix-patches-2da0f2828b5ef58b87eb0f4aed942748e6682f2f.tar guix-patches-2da0f2828b5ef58b87eb0f4aed942748e6682f2f.tar.gz | |
gnu: petsc-openmpi: Remove input labels.
* gnu/packages/maths.scm (petsc-openmpi)[inputs]: Use 'modify-inputs'.
[arguments]: Adjust label name for hdf5.
| -rw-r--r-- | gnu/packages/maths.scm | 24 |
1 files changed, 13 insertions, 11 deletions
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 |