diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-18 18:47:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-18 18:47:14 -0400 |
commit | 3e25412e3b743c771e9f36466aadd8a990ee4f6b (patch) | |
tree | d1f544898f77541d33cbf7b7ceef8b8936ea79bc | |
parent | b2e0ab39a740590a15ef77c2326d5400208f86c0 (diff) | |
parent | 0cd086946251b9acab10392451b0429fcc8af689 (diff) | |
download | nixpkgs-3e25412e3b743c771e9f36466aadd8a990ee4f6b.tar nixpkgs-3e25412e3b743c771e9f36466aadd8a990ee4f6b.tar.gz nixpkgs-3e25412e3b743c771e9f36466aadd8a990ee4f6b.tar.bz2 nixpkgs-3e25412e3b743c771e9f36466aadd8a990ee4f6b.tar.lz nixpkgs-3e25412e3b743c771e9f36466aadd8a990ee4f6b.tar.xz nixpkgs-3e25412e3b743c771e9f36466aadd8a990ee4f6b.tar.zst nixpkgs-3e25412e3b743c771e9f36466aadd8a990ee4f6b.zip |
Merge pull request #65008 from dtzWill/feature/victor-mono-font
victor-mono: improvements from previous PR
-rw-r--r-- | pkgs/data/fonts/victor-mono/default.nix | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index d83e412267a..e1ef611d686 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -3,27 +3,37 @@ let pname = "victor-mono"; version = "1.2.1"; -in fetchFromGitHub { +in fetchFromGitHub rec { name = "${pname}-${version}"; owner = "rubjo"; repo = pname; 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 = '' - tar xf $downloadedFile --strip=1 - unzip public/VictorMonoAll.zip TTF/\* - mkdir -p $out/share/fonts/truetype/${pname} - cp TTF/*.ttf $out/share/fonts/truetype/${pname} + tar xvf $downloadedFile --strip-components=2 ${name}/public/VictorMonoAll.zip + + mkdir -p $out/share/fonts/{true,open}type/${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; { - homepage = https://rubjo.github.io/victor-mono; - description = "A free programming font with cursive italics and ligatures"; + description = "Free programming font with cursive italics and ligatures"; + homepage = "https://rubjo.github.io/victor-mono"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ jpotier ]; + maintainers = with maintainers; [ jpotier dtzWill ]; platforms = platforms.all; }; } + |