public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Building octave with mesa and fltk to have the new fltk graphics toolkit available.

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2012-02-21 22:09:48 +00:00
parent 5e2de19cc1
commit b5a904153b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/octave/default.nix
View File

@ -1,5 +1,6 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, {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 { stdenv.mkDerivation rec {
name = "octave-3.4.3"; name = "octave-3.4.3";
@ -9,7 +10,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 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; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View File

@ -2664,7 +2664,9 @@ let
maude = callPackage ../development/interpreters/maude { }; maude = callPackage ../development/interpreters/maude { };
octave = callPackage ../development/interpreters/octave { }; octave = callPackage ../development/interpreters/octave {
fltk = fltk13;
};
# mercurial (hg) bleeding edge version # mercurial (hg) bleeding edge version
octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; octaveHG = callPackage ../development/interpreters/octave/hg.nix { };