mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
p4est-sc: remove openssh from checkInputs
Is taken care of by mpiCheckPhaseHook
This commit is contained in:
parent
b8b2c84dda
commit
17277615a7
@ -1,14 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook
|
||||
, autoreconfHook, pkg-config
|
||||
, p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true
|
||||
, mpi, openssh, zlib
|
||||
, mpi, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
dbg = lib.optionalString debugEnable "-dbg";
|
||||
debugEnable = p4est-sc-debugEnable;
|
||||
mpiSupport = p4est-sc-mpiSupport;
|
||||
isOpenmpi = mpiSupport && mpi.pname == "openmpi";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "p4est-sc${dbg}";
|
||||
@ -24,9 +23,7 @@ stdenv.mkDerivation {
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
propagatedNativeBuildInputs = lib.optional mpiSupport mpi
|
||||
++ lib.optional isOpenmpi openssh
|
||||
;
|
||||
propagatedNativeBuildInputs = lib.optional mpiSupport mpi ;
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
inherit debugEnable mpiSupport;
|
||||
|
||||
@ -49,7 +46,6 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeCheckInputs = lib.optionals mpiSupport [
|
||||
mpiCheckPhaseHook
|
||||
openssh
|
||||
];
|
||||
|
||||
# disallow Darwin checks due to prototype incompatibility of qsort_r
|
||||
|
Loading…
Reference in New Issue
Block a user