JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #143396 from SuperSandro2000/lib.lists.optional

Browse Source 
gromacs: replace lib.lists.optional with lib.optional
This commit is contained in:
figsoda 2021-10-28 10:59:34 -04:00 committed by GitHub
commit 693c0867c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
View File

@ -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";