Fixing octave, so plot(1) works.

Linking octave with clapack did not work.

I updated lapack, and additionally I build it with atlas, instead of blas. That should give
better performance. I don't know if atlas builds everywhere though.

On the other hand, maybe some programs linking with liblapack will fail. We'll have to check
the hydra reports.

I plan to remove clapack; liblapack provides a C interface too.


svn path=/nixpkgs/trunk/; revision=32464

1 files changed, 2 insertions, 6 deletions

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 84374e1e3d56..439b687dacef 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick, pcre, atlas, clapack, texLive }:
+libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "octave-3.4.3";
@@ -9,13 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre clapack atlas texLive ];
+    graphicsmagick pcre liblapack texLive pkgconfig ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    configureFlagsArray=('--with-blas=-L${atlas}/lib -lf77blas -latlas'
-      '--with-lapack=-L${clapack}/lib -llapack -lf2c')
-  '';
   configureFlags = [ "--enable-readline" "--enable-dl" ];
 }