From b5a904153b45012c22e65298d2cc1b61eca9ebe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 22:09:48 +0000 Subject: [PATCH] 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. svn path=/nixpkgs/trunk/; revision=32465 --- pkgs/development/interpreters/octave/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 439b687dacef..6bb3431668f4 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -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 @@ stdenv.mkDerivation rec { }; 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6952e7f54b7..36cffb34b889 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2664,7 +2664,9 @@ let 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 { };