diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-05-28 15:07:13 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-05-28 15:07:13 +0200 |
| commit | ee547881d6931c636c17f91ca066efe8f6b1ccbf (patch) | |
| tree | afa0b89c47f899d171aa188e88c34e817fb6749f /pkgs/development/interpreters | |
| parent | d8b0618e6c21fb3c5f8ed17a8030997ea8abf151 (diff) | |
| parent | 885a1318b01b5d37c6d342eacfd57c47aeb5fd53 (diff) | |
| download | nixpkgs-ee547881d6931c636c17f91ca066efe8f6b1ccbf.tar nixpkgs-ee547881d6931c636c17f91ca066efe8f6b1ccbf.tar.gz nixpkgs-ee547881d6931c636c17f91ca066efe8f6b1ccbf.tar.bz2 nixpkgs-ee547881d6931c636c17f91ca066efe8f6b1ccbf.tar.lz nixpkgs-ee547881d6931c636c17f91ca066efe8f6b1ccbf.tar.xz nixpkgs-ee547881d6931c636c17f91ca066efe8f6b1ccbf.tar.zst nixpkgs-ee547881d6931c636c17f91ca066efe8f6b1ccbf.zip | |
Merge pull request #15501 from FRidh/octave
octave: add libsndfile to buildInputs, fixes #15494
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index e0dd5a65644..e302f9e55cb 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { 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 , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? 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 - graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas + graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile fftw fftwSinglePrec qrupdate ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) |