mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 00:53:12 +03:00
Merge pull request #143396 from SuperSandro2000/lib.lists.optional
gromacs: replace lib.lists.optional with lib.optional
This commit is contained in:
commit
693c0867c5
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit,
|
||||
singlePrec ? true,
|
||||
enableMpi ? false,
|
||||
enableCuda ? false,
|
||||
cpuAcceleration ? null
|
||||
{ lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit
|
||||
, singlePrec ? true
|
||||
, enableMpi ? false
|
||||
, enableCuda ? false
|
||||
, cpuAcceleration ? null
|
||||
}:
|
||||
|
||||
let
|
||||
@ -34,12 +34,12 @@ in stdenv.mkDerivation rec {
|
||||
hwloc
|
||||
blas
|
||||
lapack
|
||||
] ++ lib.lists.optional enableMpi mpi
|
||||
++ lib.lists.optional enableCuda cudatoolkit
|
||||
] ++ lib.optional enableMpi mpi
|
||||
++ lib.optional enableCuda cudatoolkit
|
||||
;
|
||||
|
||||
propagatedBuildInputs = lib.lists.optional enableMpi mpi;
|
||||
propagatedUserEnvPkgs = lib.lists.optional enableMpi mpi;
|
||||
propagatedBuildInputs = lib.optional enableMpi mpi;
|
||||
propagatedUserEnvPkgs = lib.optional enableMpi mpi;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGMX_SIMD:STRING=${SIMD cpuAcceleration}"
|
||||
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
|
||||
else [
|
||||
"-DGMX_MPI:BOOL=FALSE"
|
||||
]
|
||||
) ++ lib.lists.optional enableCuda "-DGMX_GPU=CUDA";
|
||||
) ++ lib.optional enableCuda "-DGMX_GPU=CUDA";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.gromacs.org";
|
||||
|
Loading…
Reference in New Issue
Block a user