public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octave: fix overridePlatforms (was just platforms) name collision, thanks to @bjornfor for catching

Browse Source
This commit is contained in:
Michael Raskin 2016-09-06 19:56:58 +02:00
parent d0c2c99571
commit d9c76736cc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/octave/default.nix
View File

@ -2,7 +2,7 @@
, libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk
, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , 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 let
@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
homepage = http://octave.org/; homepage = http://octave.org/;
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [viric raskin]; 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;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -5874,7 +5874,7 @@ in
}; };
octaveFull = (lowPrio (callPackage ../development/interpreters/octave { octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
qt = qt4; qt = qt4;
platforms = ["x86_64-linux" "x86_64-darwin"]; overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
})); }));
ocropus = callPackage ../applications/misc/ocropus { }; ocropus = callPackage ../applications/misc/ocropus { };