From 0e570199ded1075fe9e491711417c28d02d9b5d4 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 1 Dec 2018 21:26:37 +0100 Subject: [PATCH] sage: fix jmol integration --- pkgs/applications/science/math/sage/env-locations.nix | 2 +- pkgs/applications/science/math/sage/sage-env.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 9d94e9ca5e3..9ec8d5cd83e 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -39,7 +39,7 @@ writeTextFile rec { export ECLDIR='${ecl}/lib/ecl-${ecl.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" - export JMOL_DIR="${jmol}" + export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar export JSMOL_DIR="${jmol}/share/jsmol" export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax" export THREEJS_DIR="${three}/lib/node_modules/three" diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 725ca043867..c071f894550 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -44,6 +44,7 @@ , zlib , gsl , ntl +, jdk }: # This generates a `sage-env` shell file that will be sourced by sage on startup. @@ -91,6 +92,7 @@ let lcalc rubiks flintqs + jdk # only needed for `jmol` which may be replaced in the future ] )); in