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/calculix | |
| parent | 43873351ffed36b52170571839e26b57c9f15920 (diff) | |
| download | nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.gz nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.bz2 nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.lz nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.xz nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.zst nixlib-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/calculix')
| -rw-r--r-- | pkgs/applications/science/math/calculix/calculix.patch | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/math/calculix/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 311421f2ef54..5b8f492a8e7c 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -15,7 +15,7 @@ index 9cab2fc..6e977b8 100755 OCCXMAIN = $(SCCXMAIN:.c=.o) -DIR=../../../SPOOLES.2.2 -+LIBS = -lpthread -lm -lc -lspooles -larpack -lopenblas ++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack -LIBS = \ - $(DIR)/spooles.a \ diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 6f2d61cd80f0..44882594550b 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, arpack, spooles, openblas }: +{ stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: stdenv.mkDerivation rec { pname = "calculix"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; - buildInputs = [ arpack spooles openblas ]; + buildInputs = [ arpack spooles blas lapack ]; NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles"; |