|
|
|
@ -58,9 +58,6 @@ |
|
|
|
|
, qtscript ? null |
|
|
|
|
, qscintilla ? null |
|
|
|
|
, qttools ? null |
|
|
|
|
# - JIT compiler for loops: |
|
|
|
|
, enableJIT ? false |
|
|
|
|
, llvm ? null |
|
|
|
|
, libiconv |
|
|
|
|
, darwin |
|
|
|
|
}: |
|
|
|
@ -173,7 +170,6 @@ let |
|
|
|
|
texinfo |
|
|
|
|
] |
|
|
|
|
++ lib.optionals (sundials != null) [ sundials ] |
|
|
|
|
++ lib.optionals enableJIT [ llvm ] |
|
|
|
|
++ lib.optionals enableQt [ |
|
|
|
|
qtscript |
|
|
|
|
qttools |
|
|
|
@ -199,7 +195,6 @@ let |
|
|
|
|
++ lib.optionals enableReadline [ "--enable-readline" ] |
|
|
|
|
++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] |
|
|
|
|
++ lib.optionals enableQt [ "--with-qt=5" ] |
|
|
|
|
++ lib.optionals enableJIT [ "--enable-jit" ] |
|
|
|
|
; |
|
|
|
|
|
|
|
|
|
# Keep a copy of the octave tests detailed results in the output |
|
|
|
@ -220,7 +215,7 @@ let |
|
|
|
|
inherit portaudio; |
|
|
|
|
inherit jdk; |
|
|
|
|
inherit python; |
|
|
|
|
inherit enableQt enableJIT enableReadline enableJava; |
|
|
|
|
inherit enableQt enableReadline enableJava; |
|
|
|
|
buildEnv = callPackage ./build-env.nix { |
|
|
|
|
octave = self; |
|
|
|
|
inherit octavePackages wrapOctave; |
|
|
|
@ -236,8 +231,6 @@ let |
|
|
|
|
license = lib.licenses.gpl3Plus; |
|
|
|
|
maintainers = with lib.maintainers; [ raskin doronbehar ]; |
|
|
|
|
description = "Scientific Programming Language"; |
|
|
|
|
# https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT |
|
|
|
|
broken = enableJIT; |
|
|
|
|
platforms = if overridePlatforms == null then |
|
|
|
|
(lib.platforms.linux ++ lib.platforms.darwin) |
|
|
|
|
else overridePlatforms; |
|
|
|
|