about summary refs log tree commit diff
path: root/pkgs/data/fonts/lmodern
diff options
context:
space:
mode:
authorVolth <volth@webmaster.ms>2017-08-10 19:43:49 +0000
committerVolth <volth@webmaster.ms>2017-08-11 14:26:03 +0000
commit31c344982f0c47af4d33cb5a37125deb1d767ef0 (patch)
tree66227ecc2adcf14cc1a552364eb8940358199f5a /pkgs/data/fonts/lmodern
parent691da0cbb99c7b72480bc836b11cc296739edaee (diff)
downloadnixlib-31c344982f0c47af4d33cb5a37125deb1d767ef0.tar
nixlib-31c344982f0c47af4d33cb5a37125deb1d767ef0.tar.gz
nixlib-31c344982f0c47af4d33cb5a37125deb1d767ef0.tar.bz2
nixlib-31c344982f0c47af4d33cb5a37125deb1d767ef0.tar.lz
nixlib-31c344982f0c47af4d33cb5a37125deb1d767ef0.tar.xz
nixlib-31c344982f0c47af4d33cb5a37125deb1d767ef0.tar.zst
nixlib-31c344982f0c47af4d33cb5a37125deb1d767ef0.zip
data/fonts: simpler cleanups
Diffstat (limited to 'pkgs/data/fonts/lmodern')
-rw-r--r--pkgs/data/fonts/lmodern/default.nix23
-rw-r--r--pkgs/data/fonts/lmodern/lmmath.nix20
2 files changed, 20 insertions, 23 deletions
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
index e694ba4db75e..6876000d6e41 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "lmodern-2.004.4";
-  
-  src = fetchurl {
-    url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz;
-    sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw";
-  };
 
-  installPhase = ''
+  url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz;
+
+  postFetch = ''
+    tar xzvf $downloadedFile
+
     mkdir -p $out/texmf-dist/
     mkdir -p $out/share/fonts/
 
-    cp -r ./* $out/texmf-dist/
-    cp -r fonts/{opentype,type1} $out/share/fonts/
+    cp -r lmodern-2.004.4/* $out/texmf-dist/
+    cp -r lmodern-2.004.4/fonts/{opentype,type1} $out/share/fonts/
 
-    ln -s $out/texmf* $out/share/
+    ln -s -r $out/texmf* $out/share/
   '';
 
+  sha256 = "13n7ls8ss4sffd6c1iw2wb5hbq642i0fmivm76mbqwf652l002i5";
+
   meta = {
     description = "Latin Modern font";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix
index 6e136c39eb00..c6e0788eed38 100644
--- a/pkgs/data/fonts/lmodern/lmmath.nix
+++ b/pkgs/data/fonts/lmodern/lmmath.nix
@@ -1,28 +1,24 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation {
+fetchzip {
   name = "lmmath-0.903";
-  
-  src = fetchurl {
-    url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf";
-    sha256 = "ee96cb14f5c746d6c6b9ecfbdf97dafc2f535be3dd277e15e8ea6fb594995d64";
-    name = "lmmath-0.903.zip";
-  };
 
-  buildInputs = [unzip];
+  url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf";
 
-  sourceRoot = ".";
+  postFetch = ''
+    unzip $downloadedFile
 
-  installPhase = ''
     mkdir -p $out/texmf-dist/fonts/opentype
     mkdir -p $out/share/fonts/opentype
 
     cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf
     cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf
 
-    ln -s $out/texmf* $out/share/
+    ln -s -r $out/texmf* $out/share/
   '';
 
+  sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln";
+
   meta = {
     description = "Latin Modern font";
     platforms = stdenv.lib.platforms.unix;