Author: viric
Date: Tue Feb 21 22:09:48 2012
New Revision: 32465
URL: https://nixos.org/websvn/nix/?rev=32465&sc=1
Log:
Building octave with mesa and fltk to have the new fltk graphics toolkit
available.
I also add more libs octave appreciates for some functions.
I've not tested the graphics toolkit, but it builds.
Modified:
nixpkgs/trunk/pkgs/development/interpreters/octave/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/octave/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/octave/default.nix Tue Feb
21 21:43:44 2012 (r32464)
+++ nixpkgs/trunk/pkgs/development/interpreters/octave/default.nix Tue Feb
21 22:09:48 2012 (r32465)
@@ -1,5 +1,6 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig }:
+libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
+fftw, fftwSinglePrec, zlib, curl }:
stdenv.mkDerivation rec {
name = "octave-3.4.3";
@@ -9,7 +10,8 @@
};
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
- graphicsmagick pcre liblapack texLive pkgconfig ];
+ graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
+ fftw fftwSinglePrec ];
enableParallelBuilding = true;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 21 21:43:44
2012 (r32464)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 21 22:09:48
2012 (r32465)
@@ -2664,7 +2664,9 @@
maude = callPackage ../development/interpreters/maude { };
- octave = callPackage ../development/interpreters/octave { };
+ octave = callPackage ../development/interpreters/octave {
+ fltk = fltk13;
+ };
# mercurial (hg) bleeding edge version
octaveHG = callPackage ../development/interpreters/octave/hg.nix { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
