summary refs log tree commit diff
path: root/pkgs/development/interpreters/octave
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-09-06 19:56:58 +0200
committerMichael Raskin <7c6f434c@mail.ru>2016-09-06 19:57:06 +0200
commitd9c76736cc6e3b8e9a7dc06bf824d06a22a6a699 (patch)
treebcd6f6fd1f58519e1be5665270ff03198ccd8d88 /pkgs/development/interpreters/octave
parentd0c2c9957126aec9c8c615ea999e45ff70acbad1 (diff)
downloadnixpkgs-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar
nixpkgs-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.gz
nixpkgs-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.bz2
nixpkgs-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.lz
nixpkgs-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.xz
nixpkgs-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.zst
nixpkgs-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.zip
octave: fix overridePlatforms (was just platforms) name collision, thanks to @bjornfor for catching
Diffstat (limited to 'pkgs/development/interpreters/octave')
-rw-r--r--pkgs/development/interpreters/octave/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f9afb190f66..3389620cdd9 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, platforms ? null
+, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
 }:
 
 let
@@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
     homepage = http://octave.org/;
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric raskin];
-    platforms = with stdenv.lib.platforms; if platforms == null then linux ++ darwin else platforms;
+    platforms = if overridePlatforms == null then
+      (with stdenv.lib.platforms; linux ++ darwin)
+    else overridePlatforms;
   };
 }