From e8740d88f9c8051602f8c80d6c8c58698aa6499f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 20 Mar 2021 02:13:56 +0100 Subject: [PATCH 1/2] vollkorn: fix location of doc files --- pkgs/vollkorn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/vollkorn/default.nix b/pkgs/vollkorn/default.nix index 647037e..442ad6a 100644 --- a/pkgs/vollkorn/default.nix +++ b/pkgs/vollkorn/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2,EOT}} - cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/ + cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ cp -v EOT/*.eot $out/share/fonts/EOT cp -v PS-OTF/*.otf $out/share/fonts/opentype cp -v TTF/*.ttf $out/share/fonts/truetype From 21f79995f2dac08731199a1ebec9926cacc4b821 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 20 Mar 2021 02:17:14 +0100 Subject: [PATCH 2/2] vollkorn: stop shipping EOT fonts as this is proprietary, Internet Explorer only --- pkgs/vollkorn/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/vollkorn/default.nix b/pkgs/vollkorn/default.nix index 442ad6a..3fe0f23 100644 --- a/pkgs/vollkorn/default.nix +++ b/pkgs/vollkorn/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2,EOT}} + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ - cp -v EOT/*.eot $out/share/fonts/EOT cp -v PS-OTF/*.otf $out/share/fonts/opentype cp -v TTF/*.ttf $out/share/fonts/truetype cp -v WOFF/*.woff $out/share/fonts/WOFF