git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #50101 from r-ryantm/auto-update/gmsh

gmsh: 4.0.2 -> 4.0.4

commitf597a885424d1d8ebeaa679f7c7a74d86176213f authormarkuskowa <markus.kowalewski@gmail.com> dateWed 14 Nov 2018, 12:46 (8 years ago) parent231e671644ab70
2 files changed+5−46
pkgs/applications/science/math/gmsh/CMakeLists.txt.patch−37 pkgs/applications/science/math/gmsh/default.nix+5−9
pkgs/applications/science/math/gmsh/CMakeLists.txt.patchdeleted−37
@@ -1,37 +0,0 @@
1−--- a/CMakeLists.txt
2−+++ b/CMakeLists.txt
3−@@ -324,25 +324,16 @@
4− set_config_option(HAVE_BLAS "Blas(IntelMKL)")
5− set_config_option(HAVE_LAPACK "Lapack(IntelMKL)")
6− else(LAPACK_LIBRARIES)
7−- # on Linux also try to find ATLAS without a Fortran compiler, because
8−- # cmake ships with a buggy FindBLAS e.g. on Ubuntu Lucid Lynx
9−- set(ATLAS_LIBS_REQUIRED lapack f77blas cblas atlas)
10−- find_all_libraries(LAPACK_LIBRARIES ATLAS_LIBS_REQUIRED "" "")
11−+ # try with generic names
12−+ set(GENERIC_LIBS_REQUIRED lapack blas pthread)
13−+ find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
14− if(LAPACK_LIBRARIES)
15−- set_config_option(HAVE_BLAS "Blas(ATLAS)")
16−- set_config_option(HAVE_LAPACK "Lapack(ATLAS)")
17−- else(LAPACK_LIBRARIES)
18−- # try with generic names
19−- set(GENERIC_LIBS_REQUIRED lapack blas pthread)
20−- find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
21−- if(LAPACK_LIBRARIES)
22−- set_config_option(HAVE_BLAS "Blas(Generic)")
23−- set_config_option(HAVE_LAPACK "Lapack(Generic)")
24−- find_library(GFORTRAN_LIB gfortran)
25−- if(GFORTRAN_LIB)
26−- list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
27−- endif(GFORTRAN_LIB)
28−- endif(LAPACK_LIBRARIES)
29−+ set_config_option(HAVE_BLAS "Blas(Generic)")
30−+ set_config_option(HAVE_LAPACK "Lapack(Generic)")
31−+ find_library(GFORTRAN_LIB gfortran)
32−+ if(GFORTRAN_LIB)
33−+ list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
34−+ endif(GFORTRAN_LIB)
35− endif(LAPACK_LIBRARIES)
36− endif(LAPACK_LIBRARIES)
37− elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
pkgs/applications/science/math/gmsh/default.nix+5−9
@@ -1,21 +1,17 @@
1−{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
1+{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
22, zlib, libGLU_combined, libGLU, xorg }:
33
4−let version = "4.0.2"; in
4+let version = "4.0.4"; in
55
66stdenv.mkDerivation {
77 name = "gmsh-${version}";
88
99 src = fetchurl {
1010 url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
11− sha256 = "03aw3sbz4x998rk29az7mgm0mrdb6614aqnppg81p5jkh5097jgk";
11+ sha256 = "1hvrls3xyxvn69kwicpvndrs0zhifcfkhfsxr8zkmhmn6fhnjhha";
1212 };
1313
14− # The original CMakeLists tries to use some version of the Lapack lib
15− # that is supposed to work without Fortran but didn't for me.
16− patches = [ ./CMakeLists.txt.patch ];
17−
18− buildInputs = [ cmake blas liblapack gmm fltk libjpeg zlib libGLU_combined
14+ buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
1915 libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
2016 xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
2117 ];
@@ -27,7 +23,7 @@ stdenv.mkDerivation {
2723 meta = {
2824 description = "A three-dimensional finite element mesh generator";
2925 homepage = http://gmsh.info/;
30− platforms = stdenv.lib.platforms.all;
26+ platforms = [ "x86_64-linux" ];
3127 license = stdenv.lib.licenses.gpl2Plus;
3228 };
3329}