diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-02-11 22:50:27 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-02-22 12:33:58 +0200 |
| commit | d4861e2b18a47b21b60d9a0018e1b96878458588 (patch) | |
| tree | 4f67f4f01caad561efadf0cb888fc6b23cc4c950 /pkgs/development/interpreters/octave | |
| parent | 2b18e72064173e195ceabffb322803ae35e4a426 (diff) | |
| download | nixpkgs-d4861e2b18a47b21b60d9a0018e1b96878458588.tar nixpkgs-d4861e2b18a47b21b60d9a0018e1b96878458588.tar.gz nixpkgs-d4861e2b18a47b21b60d9a0018e1b96878458588.tar.bz2 nixpkgs-d4861e2b18a47b21b60d9a0018e1b96878458588.tar.lz nixpkgs-d4861e2b18a47b21b60d9a0018e1b96878458588.tar.xz nixpkgs-d4861e2b18a47b21b60d9a0018e1b96878458588.tar.zst nixpkgs-d4861e2b18a47b21b60d9a0018e1b96878458588.zip | |
octave: clean up all build inputs - use qt5
Diffstat (limited to 'pkgs/development/interpreters/octave')
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 67 |
1 files changed, 51 insertions, 16 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 473176ec9a9..14d1913a1ab 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -68,22 +68,57 @@ stdenv.mkDerivation rec { sha256 = "1qcmcpsq1lfka19fxzvxjwjhg113c39a9a0x8plkhvwdqyrn5sig"; }; - buildInputs = [ gfortran readline ncurses perl flex texinfo qhull - graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw - fftwSinglePrec portaudio qrupdate arpack libwebp gl2ps ] - ++ (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) - ++ (stdenv.lib.optional (glpk != null) glpk) - ++ (stdenv.lib.optional (suitesparse != null) suitesparse) - ++ (stdenv.lib.optional (jdk != null) jdk) - ++ (stdenv.lib.optional (gnuplot != null) gnuplot) - ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) - ; - + buildInputs = [ + readline + ncurses + perl + flex + qhull + graphicsmagick + pcre + fltk + zlib + curl + openblas + libsndfile + fftw + fftwSinglePrec + portaudio + qrupdate + arpack + libwebp + gl2ps + ] + ++ (stdenv.lib.optionals enableQt [ + qtbase + qtsvg + qscintilla + ]) + ++ (stdenv.lib.optional (ghostscript != null) ghostscript) + ++ (stdenv.lib.optional (hdf5 != null) hdf5) + ++ (stdenv.lib.optional (glpk != null) glpk) + ++ (stdenv.lib.optional (suitesparse != null) suitesparse) + ++ (stdenv.lib.optional (jdk != null) jdk) + ++ (stdenv.lib.optional (sundials != null) sundials) + ++ (stdenv.lib.optional (gnuplot != null) gnuplot) + ++ (stdenv.lib.optional (python != null) python) + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) + ; + nativeBuildInputs = [ + pkgconfig + gfortran + # Listed here as well because it's outputs are split + fftw + fftwSinglePrec + texinfo + ] + ++ (stdenv.lib.optional (sundials != null) sundials) + ++ (stdenv.lib.optional enableJIT llvm) + ++ (stdenv.lib.optionals enableQt [ + qtscript + qttools + ]) + ; doCheck = !stdenv.isDarwin; |