Merge pull request #51337 from timokau/sagenb-matplotlib-fix

sage: misc fixes
This commit is contained in:
Timo Kaufmann 2018-12-01 22:04:48 +01:00 committed by GitHub
commit 88b69a0d40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

View File

@ -39,7 +39,7 @@ writeTextFile rec {
export ECLDIR='${ecl}/lib/ecl-${ecl.version}/' export ECLDIR='${ecl}/lib/ecl-${ecl.version}/'
export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" 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 JSMOL_DIR="${jmol}/share/jsmol"
export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax" export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax"
export THREEJS_DIR="${three}/lib/node_modules/three" export THREEJS_DIR="${three}/lib/node_modules/three"

View File

@ -44,6 +44,7 @@
, zlib , zlib
, gsl , gsl
, ntl , ntl
, jdk
}: }:
# This generates a `sage-env` shell file that will be sourced by sage on startup. # This generates a `sage-env` shell file that will be sourced by sage on startup.
@ -91,6 +92,7 @@ let
lcalc lcalc
rubiks rubiks
flintqs flintqs
jdk # only needed for `jmol` which may be replaced in the future
] ]
)); ));
in in

View File

@ -55,6 +55,7 @@ buildPythonPackage rec {
# let sagenb use mathjax # let sagenb use mathjax
postInstall = '' postInstall = ''
ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/mathjax" mkdir -p "$out/${python.sitePackages}/sagenb/data"
ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/sagenb/data/mathjax"
''; '';
} }