diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-10-19 15:21:37 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2016-10-20 01:16:29 +0200 |
| commit | d1c2341c8942873eedd3c5e12a12fb645d7ef511 (patch) | |
| tree | e2b0523921e60a2d4aeedd74cbc4226d893abb88 | |
| parent | fc199022602aaca4ed54c86db5f4ba0e10ac1c60 (diff) | |
| download | nixpkgs-d1c2341c8942873eedd3c5e12a12fb645d7ef511.tar nixpkgs-d1c2341c8942873eedd3c5e12a12fb645d7ef511.tar.gz nixpkgs-d1c2341c8942873eedd3c5e12a12fb645d7ef511.tar.bz2 nixpkgs-d1c2341c8942873eedd3c5e12a12fb645d7ef511.tar.lz nixpkgs-d1c2341c8942873eedd3c5e12a12fb645d7ef511.tar.xz nixpkgs-d1c2341c8942873eedd3c5e12a12fb645d7ef511.tar.zst nixpkgs-d1c2341c8942873eedd3c5e12a12fb645d7ef511.zip | |
league-of-moveable-type: fix raleway integration
The raleway fonts need to be copied from their /share folder to be included properly. They are also `.otf`-fonts, so they should live in `opentype` folders.
| -rw-r--r-- | pkgs/data/fonts/league-of-moveable-type/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/fonts/raleway/default.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index d93d2016971..e02ee967b67 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' - mkdir -p $out/share/fonts/truetype - cp */*.otf $out/share/fonts/truetype + mkdir -p $out/share/fonts/opentype + cp */*.otf $out/share/fonts/opentype + # for Raleway, where the fonts are already in /share/… + cp */share/fonts/opentype/*.otf $out/share/fonts/opentype ''; meta = { diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index 2bc90e83d14..1b39fc2b018 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/share/fonts/truetype - cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/truetype + mkdir -p $out/share/fonts/opentype + cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/opentype find -type f -maxdepth 1 -exec cp "{}" $out/ \; ''; |