diff options
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 68365b27a44f..f9afb190f66e 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -2,7 +2,7 @@ , libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , 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, platforms ? null }: let @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = http://octave.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with stdenv.lib.platforms; if platforms == null then linux ++ darwin else platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97d6dbe741d6..9fc8932fe650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5874,6 +5874,7 @@ in }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { qt = qt4; + platforms = ["x86_64-linux" "x86_64-darwin"]; })); ocropus = callPackage ../applications/misc/ocropus { }; |