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

Merge pull request #15501 from FRidh/octave

Browse Source 
octave: add libsndfile to buildInputs, fixes #15494
This commit is contained in:
Frederik Rietdijk 2016-05-28 15:07:13 +02:00
commit ee547881d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
, 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
, 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
@ -26,7 +26,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 graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile
fftw fftwSinglePrec qrupdate ] fftw fftwSinglePrec qrupdate ]
++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (qscintilla != null) qscintilla)