forked from mirrors/nixpkgs
Merge pull request #129350 from cburstedde/package-p4est-sc
This commit is contained in:
commit
da0ccc6f62
|
@ -42,12 +42,18 @@ stdenv.mkDerivation {
|
|||
++ lib.optional mpiSupport "--enable-mpi"
|
||||
;
|
||||
|
||||
makeFlags = [ "V=0" ];
|
||||
checkFlags = lib.optional isOpenmpi "-j1";
|
||||
|
||||
dontDisableStatic = true;
|
||||
enableParallelBuilding = true;
|
||||
doCheck = !stdenv.isAarch64 && stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
makeFlags = [ "V=0" ];
|
||||
|
||||
preCheck = ''
|
||||
export OMPI_MCA_rmaps_base_oversubscribe=1
|
||||
export HYDRA_IFACE=lo
|
||||
'';
|
||||
|
||||
# disallow Darwin checks due to prototype incompatibility of qsort_r
|
||||
# to be fixed in a future version of the source code
|
||||
doCheck = !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
|
||||
meta = {
|
||||
branch = "prev3-develop";
|
||||
|
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
|||
++ lib.optional withMetis "--with-metis"
|
||||
;
|
||||
|
||||
inherit (p4est-sc) makeFlags checkFlags dontDisableStatic enableParallelBuilding doCheck;
|
||||
inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck;
|
||||
|
||||
meta = {
|
||||
branch = "prev3-develop";
|
||||
|
|
Loading…
Reference in a new issue