suitesparse: remove ? null, remove empty list
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
config,
|
||||
enableCuda ? config.cudaSupport,
|
||||
cudaPackages,
|
||||
openmp ? null,
|
||||
llvmPackages,
|
||||
}@inputs:
|
||||
|
||||
let
|
||||
@@ -36,14 +36,13 @@ effectiveStdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
]
|
||||
++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
nativeBuildInputs =
|
||||
lib.optionals effectiveStdenv.hostPlatform.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
# Use compatible indexing for lapack and blas used
|
||||
buildInputs =
|
||||
@@ -57,7 +56,7 @@ effectiveStdenv.mkDerivation rec {
|
||||
mpfr
|
||||
]
|
||||
++ lib.optionals effectiveStdenv.cc.isClang [
|
||||
openmp
|
||||
llvmPackages.openmp
|
||||
]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_cudart
|
||||
|
||||
@@ -11627,9 +11627,7 @@ with pkgs;
|
||||
lapack = lapack-ilp64;
|
||||
};
|
||||
|
||||
suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { };
|
||||
suitesparse = suitesparse_5_3;
|
||||
|
||||
trilinos-mpi = trilinos.override { withMPI = true; };
|
||||
|
||||
Reference in New Issue
Block a user