summary refs log tree commit diff
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-02-22 22:42:16 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-02-22 22:42:16 +0000
commit371b34e49a8e66e105019f233aad213397ca203c (patch)
tree34c0f63f0622304f1f2486862995c7bf07563516
parent61451871dfdd34a94df6e989be34b96569625dd1 (diff)
downloadnixpkgs-371b34e49a8e66e105019f233aad213397ca203c.tar
nixpkgs-371b34e49a8e66e105019f233aad213397ca203c.tar.gz
nixpkgs-371b34e49a8e66e105019f233aad213397ca203c.tar.bz2
nixpkgs-371b34e49a8e66e105019f233aad213397ca203c.tar.lz
nixpkgs-371b34e49a8e66e105019f233aad213397ca203c.tar.xz
nixpkgs-371b34e49a8e66e105019f233aad213397ca203c.tar.zst
nixpkgs-371b34e49a8e66e105019f233aad213397ca203c.zip
Making octave build with qrupdate, and keep the big log of tests results of the
check phase in the out store path.


svn path=/nixpkgs/trunk/; revision=32496
-rw-r--r--pkgs/development/interpreters/octave/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 4209ad7e36d..9d7405a64f0 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
 libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
-fftw, fftwSinglePrec, zlib, curl }:
+fftw, fftwSinglePrec, zlib, curl, qrupdate }:
 
 stdenv.mkDerivation rec {
   name = "octave-3.4.3";
@@ -11,11 +11,17 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
     graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
-    fftw fftwSinglePrec ];
+    fftw fftwSinglePrec qrupdate ];
 
   doCheck = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [ "--enable-readline" "--enable-dl" ];
+
+  # Keep a copy of the octave tests detailed results in the output
+  # derivation, because someone may care
+  postInstall = ''
+    cp test/fntests.log $out/share/octave/${name}-fntests.log
+  '';
 }