Author: simons
Date: Wed Jul 13 09:13:32 2011
New Revision: 27743
URL: https://svn.nixos.org/websvn/nix/?rev=27743&sc=1

Log:
maxima: switch from clisp to sbcl, enable tk gui, and fix various impurities

 * Build maxima with sbcl for better performance.

 * Enable the regression test suite.

 * Configure $PATH at start-up so that maxima knows how to find sbcl,
   wish, rlwrap, and gnuplot.

 * Move installed documentation and Emacs lisp modules into standard
   locations.

 * Enable parallel building.

Modified:
   nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix

Modified: nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix     Wed Jul 
13 09:13:28 2011        (r27742)
+++ nixpkgs/trunk/pkgs/applications/science/math/maxima/default.nix     Wed Jul 
13 09:13:32 2011        (r27743)
@@ -1,8 +1,12 @@
-{ stdenv, fetchurl, clisp, texinfo, perl }:
+{ stdenv, fetchurl, sbcl, texinfo, perl, makeWrapper, rlwrap ? null, tk ? 
null, gnuplot ? null }:
 
 let
   name    = "maxima";
   version = "5.24.0";
+
+  searchPath =
+    stdenv.lib.makeSearchPath "bin"
+      (stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]);
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
@@ -12,11 +16,25 @@
     sha256 = "137crv2f6hxwqrv75m8679vrlbnqgg5ww755cs4kihs1cy03bssq";
   };
 
-  preConfigure = ''
-    configureFlags="--infodir=$out/share/info --mandir=$out/share/man"
+  buildInputs = [sbcl texinfo perl makeWrapper];
+
+  postInstall = ''
+    # Make sure that maxima can find its runtime dependencies.
+    for prog in "$out/bin/"*; do
+      wrapProgram "$prog" --prefix PATH ":" "${searchPath}"
+    done
+    # Move emacs modules and documentation into the right place.
+    ensureDir $out/share/emacs $out/share/doc
+    ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
+    ln -s ../maxima/${version}/doc $out/share/doc/maxima
   '';
 
-  buildInputs = [clisp texinfo perl];
+  # The regression test suite has minor failures, but curiously enough
+  # this doesn't seem to abort the build process:
+  # 
<http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933>.
+  doCheck = true;
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "Maxima computer algebra system";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to