octave: Use latest jdk

This commit is contained in:
Doron Behar 2020-12-10 18:43:01 +02:00
parent 453c116254
commit f602e104b0

View File

@ -10555,19 +10555,16 @@ in
octave = callPackage ../development/interpreters/octave {
python = python3;
mkDerivation = stdenv.mkDerivation;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
octave-jit = callPackage ../development/interpreters/octave {
python = python3;
enableJIT = true;
mkDerivation = stdenv.mkDerivation;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
octaveFull = libsForQt5.callPackage ../development/interpreters/octave {
python = python3;
enableQt = true;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
ocropus = callPackage ../applications/misc/ocropus { };