diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 22726858a225..d8501428079b 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, python3Packages, petsc }: +{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, petsc }: stdenv.mkDerivation rec { pname = "precice"; - version = "2.0.2"; - # Todo next release switch back to versioning but for python3 support master is needed + version = "2.1.0"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "1s41wv2077d2gqj0wsxls6wkgdk9cgzcbmk2q43ha08ccq5i3dav"; + sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102"; }; cmakeFlags = [ @@ -19,15 +18,17 @@ stdenv.mkDerivation rec { "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" ]; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ]; + nativeBuildInputs = [ cmake gcc ]; - buildInputs = [ boost eigen libxml2 openmpi python3 python3Packages.numpy ]; + buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ]; enableParallelBuilding = true; meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; license = with lib.licenses; [ gpl3 ]; homepage = "https://www.precice.org/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2605ffc93821..01514c0ef60c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2351,7 +2351,7 @@ in psstop = callPackage ../tools/system/psstop { }; - precice = callPackage ../development/libraries/precice { }; + precice = callPackage ../development/libraries/precice { python3 = python37; }; pueue = callPackage ../applications/misc/pueue { };