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

octave: add arpack, libwebp, and darwin compat 

This follows on from PR #16965 for qrupdate and PR #16968 for fltk.

WIth these, the added explicit dependencies on arpack (to support
the octave `eigs` function) and `libwebp`, and not pulling X11 things,
octave works properly on darwin.
This commit is contained in:
Anthony Cowley 2016-07-15 17:17:35 -04:00
parent cfc0a5415b
commit 73ec6bea2c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
, libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk
, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null
}: }:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile
fftw fftwSinglePrec qrupdate ] fftw fftwSinglePrec qrupdate arpack libwebp ]
++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
++ (stdenv.lib.optional (ghostscript != null) ghostscript) ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
@ -38,9 +38,10 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (jdk != null) jdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python) ++ (stdenv.lib.optional (python != null) python)
++ (stdenv.lib.optionals (!stdenv.isDarwin) [mesa libX11])
; ;
doCheck = true; doCheck = !stdenv.isDarwin;
enableParallelBuilding = true; enableParallelBuilding = true;
@ -50,7 +51,9 @@ stdenv.mkDerivation rec {
"--with-blas=openblas" "--with-blas=openblas"
"--with-lapack=openblas" "--with-lapack=openblas"
] ]
++ stdenv.lib.optional openblas.blas64 "--enable-64"; ++ stdenv.lib.optional openblas.blas64 "--enable-64"
++ stdenv.lib.optionals stdenv.isDarwin ["--with-x=no"]
;
# Keep a copy of the octave tests detailed results in the output # Keep a copy of the octave tests detailed results in the output
# derivation, because someone may care # derivation, because someone may care
@ -67,6 +70,6 @@ stdenv.mkDerivation rec {
homepage = http://octave.org/; homepage = http://octave.org/;
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [viric raskin]; maintainers = with stdenv.lib.maintainers; [viric raskin];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
}; };
} }