amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: petsc-openmpi: Remove input labels.

Browse source 
* gnu/packages/maths.scm (petsc-openmpi)[inputs]: Use 'modify-inputs'.
[arguments]: Adjust label name for hdf5.
This commit is contained in:
Ludovic Courtès 2022-03-18 12:46:58 +01:00
parent 5f83f95210
commit 2da0f2828b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/maths.scm
View file

@ -3085,15 +3085,15 @@ scientific applications modeled by partial differential equations.")
(inherit petsc) (inherit petsc)
(name "petsc-openmpi") (name "petsc-openmpi")
(inputs (inputs
`(("hdf5" ,hdf5-parallel-openmpi) (modify-inputs (package-inputs petsc)
("hypre" ,hypre-openmpi) (prepend hdf5-parallel-openmpi
("metis" ,metis) hypre-openmpi
("mumps" ,mumps-openmpi) metis
("openmpi" ,openmpi) mumps-openmpi
("scalapack" ,scalapack) openmpi
("scotch" ,pt-scotch32) scalapack
("scotch" ,pt-scotch32 "metis") pt-scotch32
,@(package-inputs petsc))) `(,pt-scotch32 "metis"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments petsc) (substitute-keyword-arguments (package-arguments petsc)
((#:configure-flags cf) ((#:configure-flags cf)
@ -3106,9 +3106,11 @@ scientific applications modeled by partial differential equations.")
,(string-append "--with-mpi-dir=" ,(string-append "--with-mpi-dir="
#$(this-package-input "openmpi")) #$(this-package-input "openmpi"))
,(string-append "--with-hdf5-include=" ,(string-append "--with-hdf5-include="
#$(this-package-input "hdf5") "/include") #$(this-package-input "hdf5-parallel-openmpi")
"/include")
,(string-append "--with-hdf5-lib=" ,(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))) ,@(delete "--with-mpi=0" #$cf)))
((#:phases phases) ((#:phases phases)
#~(modify-phases #$phases #~(modify-phases #$phases