diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-03-18 23:55:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 23:55:18 -0400 |
| commit | 9a7f11e361fcca841959f544cc9887767c47cbf7 (patch) | |
| tree | 5ea2129f8fc1a4528d7fd552cd872ede2baaf75b /pkgs/data | |
| parent | 05343f6ff134c771802e554bbdacd109b7434933 (diff) | |
| parent | cdde5967458c06d73389b6a9667139318f913e16 (diff) | |
| download | nixpkgs-9a7f11e361fcca841959f544cc9887767c47cbf7.tar nixpkgs-9a7f11e361fcca841959f544cc9887767c47cbf7.tar.gz nixpkgs-9a7f11e361fcca841959f544cc9887767c47cbf7.tar.bz2 nixpkgs-9a7f11e361fcca841959f544cc9887767c47cbf7.tar.lz nixpkgs-9a7f11e361fcca841959f544cc9887767c47cbf7.tar.xz nixpkgs-9a7f11e361fcca841959f544cc9887767c47cbf7.tar.zst nixpkgs-9a7f11e361fcca841959f544cc9887767c47cbf7.zip | |
Merge pull request #82821 from veprbl/pr/lmmath_cleanup
cleanup duplicate Latin Modern fonts
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/lmmath/default.nix (renamed from pkgs/data/fonts/lm-math/default.nix) | 8 | ||||
| -rw-r--r-- | pkgs/data/fonts/lmodern/lmmath.nix | 26 |
2 files changed, 4 insertions, 30 deletions
diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lmmath/default.nix index 8df851cb9df..c971a699b2a 100644 --- a/pkgs/data/fonts/lm-math/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -3,14 +3,14 @@ let version = "1.959"; in fetchzip rec { - name = "latinmodern-math-${version}"; + name = "lmmath-${version}"; url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; postFetch = '' mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/${name}/ - unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/ - unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/ + mkdir -p $out/share/doc/latinmodern-math-${version}/ + unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ + unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ ''; sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix deleted file mode 100644 index 679f5200213..00000000000 --- a/pkgs/data/fonts/lmodern/lmmath.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchzip }: - -fetchzip { - name = "lmmath-0.903"; - - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - - postFetch = '' - unzip $downloadedFile - - 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 -r $out/texmf* $out/share/ - ''; - - sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln"; - - meta = { - description = "Latin Modern font"; - }; -} - |