diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-12-13 21:24:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 21:24:23 +0000 |
| commit | dd3ddb3e6d0429004fddf85d6649680786588856 (patch) | |
| tree | bc4be926aa3518bb19424cfab04334c91d920feb | |
| parent | ce013bb4304c6d94b2392997f77248c32bffce49 (diff) | |
| parent | 06346a12a0bd59b77f08707a3bfeaad9f131b112 (diff) | |
| download | nixpkgs-dd3ddb3e6d0429004fddf85d6649680786588856.tar nixpkgs-dd3ddb3e6d0429004fddf85d6649680786588856.tar.gz nixpkgs-dd3ddb3e6d0429004fddf85d6649680786588856.tar.bz2 nixpkgs-dd3ddb3e6d0429004fddf85d6649680786588856.tar.lz nixpkgs-dd3ddb3e6d0429004fddf85d6649680786588856.tar.xz nixpkgs-dd3ddb3e6d0429004fddf85d6649680786588856.tar.zst nixpkgs-dd3ddb3e6d0429004fddf85d6649680786588856.zip | |
Merge pull request #70772 from tmplt/octave-gl2ps
octave: build with gl2ps
| -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 66f71738537..eb9827969e1 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull , libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGL, libGLU, fltk -, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp +, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp, gl2ps , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran readline ncurses perl flex texinfo qhull graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw - fftwSinglePrec portaudio qrupdate arpack libwebp ] + fftwSinglePrec portaudio qrupdate arpack libwebp gl2ps ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (ghostscript != null) ghostscript) |