lol

scotch: make ptscotch optional

qbisi 0f237f6a 19097508

+6 -3
+3 -2
pkgs/by-name/mu/mumps/package.nix
··· 20 20 assert withParmetis -> mpiSupport; 21 21 assert withPtScotch -> mpiSupport; 22 22 let 23 + scotch' = scotch.override { inherit withPtScotch; }; 23 24 profile = if mpiSupport then "debian.PAR" else "debian.SEQ"; 24 25 LMETIS = toString ([ "-lmetis" ] ++ lib.optional withParmetis "-lparmetis"); 25 26 LSCOTCH = toString ( ··· 78 79 "LIBEXT_SHARED=.dylib" 79 80 ] 80 81 ++ [ 81 - "ISCOTCH=-I${lib.getDev scotch}/include" 82 + "ISCOTCH=-I${lib.getDev scotch'}/include" 82 83 "LMETIS=${LMETIS}" 83 84 "LSCOTCH=${LSCOTCH}" 84 85 "ORDERINGSF=${ORDERINGSF}" ··· 115 116 blas 116 117 lapack 117 118 metis 118 - scotch 119 + scotch' 119 120 ]; 120 121 121 122 doInstallCheck = true;
+3 -1
pkgs/by-name/sc/scotch/package.nix
··· 10 10 xz, 11 11 zlib, 12 12 mpi, 13 + withPtScotch ? false, 13 14 testers, 14 15 }: 15 16 ··· 33 34 34 35 cmakeFlags = [ 35 36 (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) 37 + (lib.cmakeBool "BUILD_PTSCOTCH" withPtScotch) 36 38 ]; 37 39 38 40 nativeBuildInputs = [ ··· 48 50 zlib 49 51 ]; 50 52 51 - propagatedBuildInputs = [ 53 + propagatedBuildInputs = lib.optionals withPtScotch [ 52 54 mpi 53 55 ]; 54 56