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

A larger Octave build with GUI

Browse Source
This commit is contained in:
Michael Raskin 2014-01-07 22:02:01 +04:00
parent e01af040ed
commit 37e6b8ec80
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,9 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk,
fftw, fftwSinglePrec, zlib, curl, qrupdate }: fftw, fftwSinglePrec, zlib, curl, qrupdate
, qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null
}:
let let
version = "3.8.0"; version = "3.8.0";
@ -14,7 +17,17 @@ stdenv.mkDerivation rec {
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
fftw fftwSinglePrec qrupdate ]; fftw fftwSinglePrec qrupdate ]
++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (ghostscript != null) ghostscript)
++ (stdenv.lib.optional (llvm != null) llvm)
++ (stdenv.lib.optional (hdf5 != null) hdf5)
++ (stdenv.lib.optional (glpk != null) glpk)
++ (stdenv.lib.optional (suitesparse != null) suitesparse)
++ (stdenv.lib.optional (openjdk != null) openjdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python)
;
# there is a mysterious sh: command not found # there is a mysterious sh: command not found
doCheck = false; doCheck = false;
@ -39,7 +52,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://octave.org/; homepage = http://octave.org/;
license = "GPLv3+"; license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric raskin];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }

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

@ -3274,7 +3274,16 @@ let
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {
fltk = fltk13; fltk = fltk13;
qt = null;
ghostscript = null;
llvm = null;
hdf5 = null;
glpk = null;
suitesparse = null;
openjdk = null;
gnuplot = null;
}; };
octaveFull = (lowPrio (callPackage ../development/interpreters/octave { }));
# mercurial (hg) bleeding edge version # mercurial (hg) bleeding edge version
octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; octaveHG = callPackage ../development/interpreters/octave/hg.nix { };