From 1bd56ac6fb909c69e2d8a6aae4c39e20c061fe10 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Fri, 23 Aug 2024 16:29:26 +0300 Subject: [PATCH] petsc: moved mpiSupport flag to passthru --- pkgs/applications/science/math/getdp/default.nix | 5 +++-- pkgs/by-name/pe/petsc/package.nix | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 18000c147d87..30a5837c3111 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, mpi, petsc, python3 }: -stdenv.mkDerivation rec { +let + mpiSupport = petsc.passthru.mpiSupport; +in stdenv.mkDerivation rec { pname = "getdp"; version = "3.6.0"; src = fetchurl { @@ -8,7 +10,6 @@ stdenv.mkDerivation rec { hash = "sha256-nzefwCV+Z9BHDofuTfhR+vhqm3cCSiUT+7cbtn601N8="; }; - inherit (petsc) mpiSupport; nativeBuildInputs = [ cmake python3 ]; buildInputs = [ gfortran blas lapack petsc ] ++ lib.optional mpiSupport mpi diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 6683d59198ae..2ea48a54a793 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { hash = "sha256-dxHa8JUJCN4zRIXMCx7gcvbzFH2SPtkJ377ssIevjgU="; }; - inherit mpiSupport; - strictDeps = true; nativeBuildInputs = [ python3 @@ -115,6 +113,10 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "check_install"; + passthru = { + inherit mpiSupport; + }; + meta = with lib; { description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://petsc.org/release/";