From d1c2341c8942873eedd3c5e12a12fb645d7ef511 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 19 Oct 2016 15:21:37 +0200
Subject: 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.
---
 pkgs/data/fonts/league-of-moveable-type/default.nix | 6 ++++--
 pkgs/data/fonts/raleway/default.nix                 | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs/data')

diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix
index d93d2016971a..e02ee967b677 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 2bc90e83d144..1b39fc2b0183 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/ \;
   '';
 
-- 
cgit 1.4.1