victor-mono: improvements from previous PR

Fixes #64465.

Resolves conflicts with earlier merged PR,
notable differences in the result
(by our powers combined!):

* provide both ttf and otf versions
* quote URL, since folks seem to like those
* don't put fonts in ${pname} subdirs
  fontconfig's hashing/cache is mostly geared
  for the many-fonts-in-one-place situation,
  although this may be fixed in more recent versions.
  Anyway minor change and mostly went with not modifying
  what I had ;) so happy to adjust back if that
  better matches your senses/style/use.
* Drop leading 'A' from description,
  I think this is per policy written.. somewhere O:).
* alpha-sort the meta attributes, which is easy to rem
  and generally matches what most expressions do anyway :)

Reviewer feedback:

* use subdirs with fontname, seems preferred
* fix indent, whoops
This commit is contained in:
Will Dietz 2019-07-17 18:27:26 -05:00 committed by worldofpeace
parent b2e0ab39a7
commit 0cd0869462
1 changed files with 19 additions and 9 deletions

View File

@ -3,27 +3,37 @@
let let
pname = "victor-mono"; pname = "victor-mono";
version = "1.2.1"; version = "1.2.1";
in fetchFromGitHub { in fetchFromGitHub rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
owner = "rubjo"; owner = "rubjo";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
# Upstream prefers we download from the website,
# but we really insist on a more versioned resource.
# Happily, tagged releases on github contain the same
# file `VictorMonoAll.zip` as from the website,
# so we extract it from the tagged release.
# Both methods produce the same file, but this way
# we can safely reason about what version it is.
postFetch = '' postFetch = ''
tar xf $downloadedFile --strip=1 tar xvf $downloadedFile --strip-components=2 ${name}/public/VictorMonoAll.zip
unzip public/VictorMonoAll.zip TTF/\*
mkdir -p $out/share/fonts/truetype/${pname} mkdir -p $out/share/fonts/{true,open}type/${pname}
cp TTF/*.ttf $out/share/fonts/truetype/${pname}
unzip -j VictorMonoAll.zip \*.ttf -d $out/share/fonts/truetype/${pname}
unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname}
''; '';
sha256 = "0gisjcywmn3kjgwfmzcv8ibxqd126s93id2w0zjly0c7m3ckamh8"; sha256 = "0347n3kdyrbg42rxcgnyghi21qz5iz6w30v7ms2vjal7pfm6h2vn";
meta = with lib; { meta = with lib; {
homepage = https://rubjo.github.io/victor-mono; description = "Free programming font with cursive italics and ligatures";
description = "A free programming font with cursive italics and ligatures"; homepage = "https://rubjo.github.io/victor-mono";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ jpotier ]; maintainers = with maintainers; [ jpotier dtzWill ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }