swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16095 from christopher-l/gmsh

Browse source 
gmsh: init at 2.12.0
This commit is contained in:
Joachim Fasting 2016-06-15 20:30:39 +02:00 committed by GitHub
parent cdcc1b1c53 ac4903284c
commit 46edcd668f
3 changed files with 68 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,37 @@
--- 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")

29
pkgs/applications/science/math/gmsh/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, fltk, libjpeg
, zlib, mesa, mesa_glu, xorg }:
let version = "2.12.0"; in
stdenv.mkDerivation {
name = "gmsh-${version}";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "02cx2mfbxx6m18s54z4yzbk4ybch3v9489z7cr974y8y0z42xgbz";
};
# 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 gfortran fltk libjpeg zlib mesa
mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];
meta = {
description = "A three-dimensional finite element mesh generator";
homepage = http://gmsh.info/;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl2Plus;
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -16038,6 +16038,8 @@ in
ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; };
gmsh = callPackage ../applications/science/math/gmsh { };
### SCIENCE/MOLECULAR-DYNAMICS
lammps = callPackage ../applications/science/molecular-dynamics/lammps {