summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-09-06 18:26:58 +0200
committerMichael Raskin <7c6f434c@mail.ru>2016-09-06 18:26:58 +0200
commit472ac50f5b10f4b3b4bfc03399dc2e34425f18b6 (patch)
tree67b8b16602db226c49cb95c457385f2b69169139 /pkgs
parent5c686923de8f947627cd4580fbf718fc24c5021f (diff)
downloadnixlib-472ac50f5b10f4b3b4bfc03399dc2e34425f18b6.tar
nixlib-472ac50f5b10f4b3b4bfc03399dc2e34425f18b6.tar.gz
nixlib-472ac50f5b10f4b3b4bfc03399dc2e34425f18b6.tar.bz2
nixlib-472ac50f5b10f4b3b4bfc03399dc2e34425f18b6.tar.lz
nixlib-472ac50f5b10f4b3b4bfc03399dc2e34425f18b6.tar.xz
nixlib-472ac50f5b10f4b3b4bfc03399dc2e34425f18b6.tar.zst
nixlib-472ac50f5b10f4b3b4bfc03399dc2e34425f18b6.zip
octave: forbid 32-bit builds of the octaveFull version, looks like too much memory needed
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/octave/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix1
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 { };