diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index ed989be6f710..f0ceca6a100f 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -26,10 +26,10 @@ # External libraries options withHdf5 ? withCommonDeps, withMetis ? withCommonDeps, - withZlib ? (withP4est || withPtscotch), + withZlib ? (withP4est || withPtScotch), withScalapack ? withCommonDeps && mpiSupport, withParmetis ? withFullDeps, # parmetis is unfree - withPtscotch ? withCommonDeps && mpiSupport, + withPtScotch ? withCommonDeps && mpiSupport, withMumps ? withCommonDeps, withP4est ? withFullDeps, withHypre ? withCommonDeps && mpiSupport, @@ -67,7 +67,7 @@ assert withP4est -> (mpiSupport && withZlib); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); -assert withPtscotch -> (mpiSupport && withZlib); +assert withPtScotch -> (mpiSupport && withZlib); assert withScalapack -> mpiSupport; assert (withMumps && mpiSupport) -> withScalapack; assert withHypre -> mpiSupport; @@ -83,6 +83,7 @@ let fortranSupport pythonSupport precision + withPtScotch ; enableMpi = self.mpiSupport; @@ -139,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withP4est petscPackages.p4est ++ lib.optional withMetis petscPackages.metis ++ lib.optional withParmetis petscPackages.parmetis - ++ lib.optional withPtscotch petscPackages.scotch + ++ lib.optional withPtScotch petscPackages.scotch ++ lib.optional withScalapack petscPackages.scalapack ++ lib.optional withMumps petscPackages.mumps ++ lib.optional withHypre petscPackages.hypre @@ -184,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional pythonSupport "--with-petsc4py=1" ++ lib.optional withMetis "--with-metis=1" ++ lib.optional withParmetis "--with-parmetis=1" - ++ lib.optional withPtscotch "--with-ptscotch=1" + ++ lib.optional withPtScotch "--with-ptscotch=1" ++ lib.optional withScalapack "--with-scalapack=1" ++ lib.optional withMumps "--with-mumps=1" ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1"