diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2016-09-06 19:56:58 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2016-09-06 19:57:06 +0200 |
commit | d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699 (patch) | |
tree | bcd6f6fd1f58519e1be5665270ff03198ccd8d88 | |
parent | d0c2c9957126aec9c8c615ea999e45ff70acbad1 (diff) | |
download | nixlib-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar nixlib-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.gz nixlib-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.bz2 nixlib-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.lz nixlib-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.xz nixlib-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.tar.zst nixlib-d9c76736cc6e3b8e9a7dc06bf824d06a22a6a699.zip |
octave: fix overridePlatforms (was just platforms) name collision, thanks to @bjornfor for catching
-rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index f9afb190f66e..3389620cdd94 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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fc8932fe650..5bc36f9b8286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5874,7 +5874,7 @@ in }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { qt = qt4; - platforms = ["x86_64-linux" "x86_64-darwin"]; + overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; })); ocropus = callPackage ../applications/misc/ocropus { }; |