movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-26 19:16:47 +03:00
Code Activity

elmerfem: 8.4 -> 9.0

Browse source
This commit is contained in:
Gunnar Nitsche 2021-12-26 15:16:06 +01:00
parent 7e9eb10b79
commit cc690c83f4
2 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/science/physics/elmerfem/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elmerfem"; pname = "elmerfem";
version = "8.4"; version = "9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elmercsc"; owner = "elmercsc";
repo = "elmerfem"; repo = "elmerfem";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0vk31lplxlng173q8jjcpbyj1gaf98jvkqjvi9077d1nslya7vpm"; sha256 = "VK7jvu4s5d7k0c39XqY9dEzg/vXtX5Yr/09VcuZVQ9A=";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
@ -32,15 +32,11 @@ stdenv.mkDerivation rec {
"-DCMAKE_OpenGL_GL_PREFERENCE=GLVND" "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND"
]; ];
patches = [
./fix-cmake.patch
];
meta = with lib; { meta = with lib; {
homepage = "https://elmerfem.org/"; homepage = "https://elmerfem.org/";
description = "A finite element software for multiphysical problems"; description = "A finite element software for multiphysical problems";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.wulfsta ]; maintainers = with maintainers; [ wulfsta broke ];
license = licenses.lgpl21; license = licenses.lgpl21;
}; };

13
pkgs/applications/science/physics/elmerfem/fix-cmake.patch
View file

@ -1,13 +0,0 @@
diff --exclude '*~' -ruN A/torch/CMakeLists.txt B/torch/CMakeLists.txt
--- A/fem/tests/CMakeLists.txt 2020-04-23 02:35:03.243388917 -0400
+++ B/fem/tests/CMakeLists.txt 2018-12-19 20:18:40.671857320 -0400
@@ -14,7 +14,7 @@
SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D")
MACRO(SUBDIRLIST result curdir depth)
set(glob_pattern "*")
- FOREACH(D RANGE 1 depth)
+ FOREACH(D RANGE 1 ${depth})
FILE(GLOB children RELATIVE ${curdir} ${glob_pattern})
FOREACH(child ${children})
IF(IS_DIRECTORY ${curdir}/${child})