diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 439b687dace..6bb3431668f 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 c6952e7f54b..36cffb34b88 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 { };