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…

2 files changed, 34 insertions, 7 deletions

diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
new file mode 100644
index 000000000000..a8db06319111
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, gfortran, perl, liblapack }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.10";
+
+  name = "openblas-${version}";
+  src = fetchurl {
+    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
+    sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
+    name = "openblas-${version}.tar.gz";
+  };
+
+  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
+
+  buildInputs = [gfortran perl];
+
+  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
+
+  target = if cpu == "i686" then "P2" else 
+    if cpu == "x86_64" then "CORE2" else
+     # allow autodetect
+      "";
+
+  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
+
+  meta = {
+    description = "Basic Linear Algebra Subprograms";
+    license = stdenv.lib.licenses.bsd3;
+    homepage = "https://github.com/xianyi/OpenBLAS";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 6ea7333f6986..c535b1a39dbb 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];