From bf4d34ba6260cc4464c51d73c313f0921d9fa0dc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Dec 2023 14:52:11 +0100 Subject: [PATCH] dl-poly-classic-mpi: fix build with gcc 11+ --- .../science/molecular-dynamics/dl-poly-classic/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index cf4584979ba2..a13a071584fd 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation { cp -v ../build/MakePAR Makefile ''; + # https://gitlab.com/DL_POLY_Classic/dl_poly/-/blob/master/README + env.NIX_CFLAGS_COMPILE = "-fallow-argument-mismatch"; + buildPhase = '' make dlpoly ''; @@ -33,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://www.ccp5.ac.uk/DL_POLY_C"; description = "DL_POLY Classic is a general purpose molecular dynamics simulation package"; license = licenses.bsdOriginal; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..bbde29597b96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39412,7 +39412,7 @@ with pkgs; ### SCIENCE/MOLECULAR-DYNAMICS - dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; }; + dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; lammps = callPackage ../applications/science/molecular-dynamics/lammps { fftw = fftw;