ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50101 from r-ryantm/auto-update/gmsh

Browse Source 
gmsh: 4.0.2 -> 4.0.4
This commit is contained in:
markuskowa 2018-11-14 12:46:48 +01:00 committed by GitHub
commit f597a88542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
View File

@ -1,37 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,25 +324,16 @@
set_config_option(HAVE_BLAS "Blas(IntelMKL)")
set_config_option(HAVE_LAPACK "Lapack(IntelMKL)")
else(LAPACK_LIBRARIES)
- # on Linux also try to find ATLAS without a Fortran compiler, because
- # cmake ships with a buggy FindBLAS e.g. on Ubuntu Lucid Lynx
- set(ATLAS_LIBS_REQUIRED lapack f77blas cblas atlas)
- find_all_libraries(LAPACK_LIBRARIES ATLAS_LIBS_REQUIRED "" "")
+ # try with generic names
+ set(GENERIC_LIBS_REQUIRED lapack blas pthread)
+ find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
if(LAPACK_LIBRARIES)
- set_config_option(HAVE_BLAS "Blas(ATLAS)")
- set_config_option(HAVE_LAPACK "Lapack(ATLAS)")
- else(LAPACK_LIBRARIES)
- # try with generic names
- set(GENERIC_LIBS_REQUIRED lapack blas pthread)
- find_all_libraries(LAPACK_LIBRARIES GENERIC_LIBS_REQUIRED "" "")
- if(LAPACK_LIBRARIES)
- set_config_option(HAVE_BLAS "Blas(Generic)")
- set_config_option(HAVE_LAPACK "Lapack(Generic)")
- find_library(GFORTRAN_LIB gfortran)
- if(GFORTRAN_LIB)
- list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
- endif(GFORTRAN_LIB)
- endif(LAPACK_LIBRARIES)
+ set_config_option(HAVE_BLAS "Blas(Generic)")
+ set_config_option(HAVE_LAPACK "Lapack(Generic)")
+ find_library(GFORTRAN_LIB gfortran)
+ if(GFORTRAN_LIB)
+ list(APPEND LAPACK_LIBRARIES ${GFORTRAN_LIB})
+ endif(GFORTRAN_LIB)
endif(LAPACK_LIBRARIES)
endif(LAPACK_LIBRARIES)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")

14
pkgs/applications/science/math/gmsh/default.nix
View File

@ -1,21 +1,17 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }:
let version = "4.0.2"; in
let version = "4.0.4"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "03aw3sbz4x998rk29az7mgm0mrdb6614aqnppg81p5jkh5097jgk";
sha256 = "1hvrls3xyxvn69kwicpvndrs0zhifcfkhfsxr8zkmhmn6fhnjhha";
};
# The original CMakeLists tries to use some version of the Lapack lib
# that is supposed to work without Fortran but didn't for me.
patches = [ ./CMakeLists.txt.patch ];
buildInputs = [ cmake blas liblapack gmm fltk libjpeg zlib libGLU_combined
buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];
@ -27,7 +23,7 @@ stdenv.mkDerivation {
meta = {
description = "A three-dimensional finite element mesh generator";
homepage = http://gmsh.info/;
platforms = stdenv.lib.platforms.all;
platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.gpl2Plus;
};
}