about summary refs log tree commit diff
path: root/pkgs/tools/typesetting
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-03-17 22:45:08 -0400
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-03-18 03:24:56 -0400
commitcdde5967458c06d73389b6a9667139318f913e16 (patch)
treee4f33386d25a013680208dd811e6d8df74130c52 /pkgs/tools/typesetting
parentfd867123f642fc818beb4b6847bc7236b8647015 (diff)
downloadnixlib-cdde5967458c06d73389b6a9667139318f913e16.tar
nixlib-cdde5967458c06d73389b6a9667139318f913e16.tar.gz
nixlib-cdde5967458c06d73389b6a9667139318f913e16.tar.bz2
nixlib-cdde5967458c06d73389b6a9667139318f913e16.tar.lz
nixlib-cdde5967458c06d73389b6a9667139318f913e16.tar.xz
nixlib-cdde5967458c06d73389b6a9667139318f913e16.tar.zst
nixlib-cdde5967458c06d73389b6a9667139318f913e16.zip
satysfi: use packaged Latin Modern fonts
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r--pkgs/tools/typesetting/satysfi/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index f2d447f66f6e..c355d7b6d986 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -1,16 +1,7 @@
 { stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages
-, ipaexfont, junicode
+, ipaexfont, junicode, lmodern, lmmath
 }:
 let
-  lm = fetchzip {
-    url = "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip";
-    sha256 = "1mc88fbhfd2wki2vr700pgv96smya6d1z783xs3mfy138yb6ga2p";
-    stripRoot = false;
-  };
-  lm-math = fetchzip {
-    url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
-    sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
-  };
   camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: {
     src = fetchFromGitHub {
       owner = "gfngfn";
@@ -63,8 +54,8 @@ in
     installPhase = ''
       cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/
       cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/
-      cp -r ${lm}/* lib-satysfi/dist/fonts/
-      cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
+      cp -r ${lmodern}/share/fonts/opentype/public/lm/* lib-satysfi/dist/fonts/
+      cp -r ${lmmath}/share/fonts/opentype/latinmodern-math.otf lib-satysfi/dist/fonts/
       make install PREFIX=$out LIBDIR=$out/share/satysfi
       mkdir -p $out/share/satysfi/
       cp -r lib-satysfi/dist/ $out/share/satysfi/