cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

petsc, p4est: strict dependencies (#130156)

Browse source
This commit is contained in:
Carsten Burstedde 2021-11-12 17:29:12 +01:00 committed by GitHub
parent 82037871bb
commit 4f5137569b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/science/math/p4est-sc/default.nix
View file

@ -22,11 +22,12 @@ stdenv.mkDerivation {
sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z"; sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z";
}; };
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ zlib ] propagatedNativeBuildInputs = lib.optional mpiSupport mpi
++ lib.optional mpiSupport mpi
++ lib.optional isOpenmpi openssh ++ lib.optional isOpenmpi openssh
; ;
propagatedBuildInputs = [ zlib ];
inherit debugEnable mpiSupport; inherit debugEnable mpiSupport;
postPatch = '' postPatch = ''

1
pkgs/development/libraries/science/math/p4est/default.nix
View file

@ -21,6 +21,7 @@ stdenv.mkDerivation {
sha256 = "0vffnf48rzw6d0as4c3x1f31b4kapmdzr1hfj5rz5ngah72gqrph"; sha256 = "0vffnf48rzw6d0as4c3x1f31b4kapmdzr1hfj5rz5ngah72gqrph";
}; };
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ p4est-sc ]; propagatedBuildInputs = [ p4est-sc ];
buildInputs = lib.optional withMetis metis; buildInputs = lib.optional withMetis metis;

6
pkgs/development/libraries/science/math/petsc/default.nix
View file

@ -28,10 +28,12 @@ stdenv.mkDerivation rec {
mpiSupport = !withp4est || p4est.mpiSupport; mpiSupport = !withp4est || p4est.mpiSupport;
withp4est = petsc-withp4est; withp4est = petsc-withp4est;
nativeBuildInputs = [ python3 gfortran ]; strictDeps = true;
buildInputs = [ blas lapack ] nativeBuildInputs = [ python3 gfortran ]
++ lib.optional mpiSupport mpi ++ lib.optional mpiSupport mpi
++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh
;
buildInputs = [ blas lapack ]
++ lib.optional withp4est p4est ++ lib.optional withp4est p4est
; ;