diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-24 00:24:46 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-24 00:24:55 +0400 |
commit | 33ef69390bb2d4522bf4da4dc3a92a6195a7db5c (patch) | |
tree | 0265223728a71038ffaf81a7a0016d324d86745f /pkgs/development/libraries/science/math/openblas/default.nix | |
parent | 252ee7adc9921ffa255dc90f153cc6c40e963340 (diff) | |
download | nixpkgs-33ef69390bb2d4522bf4da4dc3a92a6195a7db5c.tar nixpkgs-33ef69390bb2d4522bf4da4dc3a92a6195a7db5c.tar.gz nixpkgs-33ef69390bb2d4522bf4da4dc3a92a6195a7db5c.tar.bz2 nixpkgs-33ef69390bb2d4522bf4da4dc3a92a6195a7db5c.tar.lz nixpkgs-33ef69390bb2d4522bf4da4dc3a92a6195a7db5c.tar.xz nixpkgs-33ef69390bb2d4522bf4da4dc3a92a6195a7db5c.tar.zst nixpkgs-33ef69390bb2d4522bf4da4dc3a92a6195a7db5c.zip |
Fix Julia 0.3.0 build (for most purposes). Not making default yet because it is unclear if I missed something important. Failed to make it use external openblas and lapack correctly…
Diffstat (limited to 'pkgs/development/libraries/science/math/openblas/default.nix')
-rw-r--r-- | pkgs/development/libraries/science/math/openblas/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 6ea7333f698..c535b1a39db 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,12 +1,7 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ stdenv, fetchurl, gfortran, perl, liblapack }: stdenv.mkDerivation rec { version = "0.2.2"; - lapack_version = "3.4.1"; - lapack_src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${lapack_version}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; - }; name = "openblas-${version}"; src = fetchurl { @@ -15,7 +10,7 @@ stdenv.mkDerivation rec { name = "openblas-${version}.tar.gz"; }; - preBuild = "cp ${lapack_src} lapack-${lapack_version}.tgz"; + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; buildInputs = [gfortran perl]; |