From ced40eabfdb14b21a14e36ce1874b3090794fb3d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Wed, 14 Nov 2018 11:41:46 +0100
Subject: [PATCH] gmsh: use openblas instead of atlas/lapack
* openblas is properly recognized by cmake
* the cmake patch is no longer neccessary
---
.../science/math/gmsh/CMakeLists.txt.patch | 37 -------------------
.../science/math/gmsh/default.nix | 8 +---
2 files changed, 2 insertions(+), 43 deletions(-)
delete mode 100644 pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
diff --git a/pkgs/applications/science/math/gmsh/CMakeLists.txt.patch b/pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
deleted file mode 100644
index 0326a8d296a..00000000000
--- a/pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
+++ /dev/null
@@ -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")
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 4d0bb487c12..de4bd270d68 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,4 +1,4 @@
-{ 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.4"; in
@@ -11,11 +11,7 @@ stdenv.mkDerivation {
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
];