diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/precice/default.nix | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/precice/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/precice/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/precice/default.nix b/nixpkgs/pkgs/development/libraries/precice/default.nix index 22726858a225..e8ae15ed31f4 100644 --- a/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -1,33 +1,34 @@ -{ 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.1"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "1s41wv2077d2gqj0wsxls6wkgdk9cgzcbmk2q43ha08ccq5i3dav"; + sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg"; }; cmakeFlags = [ "-DPRECICE_PETScMapping=OFF" "-DBUILD_SHARED_LIBS=ON" "-DPYTHON_LIBRARIES=${python3.libPrefix}" - "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" + "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" ]; + 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 ]; }; } |