about summary refs log tree commit diff
path: root/pkgs/development/interpreters/octave
diff options
context:
space:
mode:
authorRĂ¼diger Sonderfeld <ruediger@c-plusplus.de>2014-08-21 02:08:19 +0200
committerMichael Raskin <7c6f434c@mail.ru>2014-09-03 12:12:00 +0400
commit8abe312cde76ee9c201e08ed45a19d8f774b176f (patch)
tree34924deb28f8fbc183fda6bbb33b245dcfa09ea9 /pkgs/development/interpreters/octave
parent698170005fe85b993e2acb6f1af46d04153109d5 (diff)
downloadnixlib-8abe312cde76ee9c201e08ed45a19d8f774b176f.tar
nixlib-8abe312cde76ee9c201e08ed45a19d8f774b176f.tar.gz
nixlib-8abe312cde76ee9c201e08ed45a19d8f774b176f.tar.bz2
nixlib-8abe312cde76ee9c201e08ed45a19d8f774b176f.tar.lz
nixlib-8abe312cde76ee9c201e08ed45a19d8f774b176f.tar.xz
nixlib-8abe312cde76ee9c201e08ed45a19d8f774b176f.tar.zst
nixlib-8abe312cde76ee9c201e08ed45a19d8f774b176f.zip
octave: Add qscintilla support. #3711
Diffstat (limited to 'pkgs/development/interpreters/octave')
-rw-r--r--pkgs/development/interpreters/octave/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index eac067da2828..d302a2a6e183 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
 , libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk
 , fftw, fftwSinglePrec, zlib, curl, qrupdate
-, qt ? 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, openjdk ? null, python ? null
 }:
 
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
     fftw fftwSinglePrec qrupdate ]
     ++ (stdenv.lib.optional (qt != null) qt)
+    ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
     ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
     ++ (stdenv.lib.optional (llvm != null) llvm)
     ++ (stdenv.lib.optional (hdf5 != null) hdf5)