diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-20 10:17:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 10:17:22 +0200 |
| commit | 209691e397fef03b6975f082b5951afa02081421 (patch) | |
| tree | afaceaeb113c13c67af6499d151f0799723a3c26 | |
| parent | ceafba91dc0f2027fdaf9991e197326b2b12d254 (diff) | |
| parent | d1c2341c8942873eedd3c5e12a12fb645d7ef511 (diff) | |
| download | nixpkgs-209691e397fef03b6975f082b5951afa02081421.tar nixpkgs-209691e397fef03b6975f082b5951afa02081421.tar.gz nixpkgs-209691e397fef03b6975f082b5951afa02081421.tar.bz2 nixpkgs-209691e397fef03b6975f082b5951afa02081421.tar.lz nixpkgs-209691e397fef03b6975f082b5951afa02081421.tar.xz nixpkgs-209691e397fef03b6975f082b5951afa02081421.tar.zst nixpkgs-209691e397fef03b6975f082b5951afa02081421.zip | |
Merge pull request #19688 from Profpatsch/league-of-moveable-type
league-of-moveable-type: fix raleway integration
| -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 c0746793159..e754135755a 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/ \; ''; |