diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-31 10:47:18 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-17 16:24:09 -0500 |
| commit | 1c8aba83340be3713f68410d1d273a8b15e7e007 (patch) | |
| tree | fdc752744f384be57b6ff3c65495018432bff0ab /pkgs/applications/science/math/gmsh/default.nix | |
| parent | 43873351ffed36b52170571839e26b57c9f15920 (diff) | |
| download | nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.gz nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.bz2 nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.lz nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.xz nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.zst nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.zip | |
treewide: use blas and lapack
This makes packages use lapack and blas, which can wrap different BLAS/LAPACK implementations. treewide: cleanup from blas/lapack changes A few issues in the original treewide: - can’t assume blas64 is a bool - unused commented code
Diffstat (limited to 'pkgs/applications/science/math/gmsh/default.nix')
| -rw-r--r-- | pkgs/applications/science/math/gmsh/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 2c4d5f254da..8ece2e7819c 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg +{ stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { pname = "gmsh"; version = "4.5.6"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0gs65bgr1ph5lz7r6manqj8cra30s7c94pxilkd2z0p5vq6fpsj6"; }; - buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL + buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE opencascade-occt |