summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-11-23 19:19:44 +0000
committerGitHub <noreply@github.com>2017-11-23 19:19:44 +0000
commite645ecf78105522c155bd180edfd425ad463faec (patch)
treed20fd8f2a56b155a631a1bc6f22e10536d883cce
parent8443352ffa539e02e28ae2b31cce200020014c7e (diff)
parentd155bf8f800cbc3f144955ecf0d8e445ce5c4c59 (diff)
downloadnixlib-e645ecf78105522c155bd180edfd425ad463faec.tar
nixlib-e645ecf78105522c155bd180edfd425ad463faec.tar.gz
nixlib-e645ecf78105522c155bd180edfd425ad463faec.tar.bz2
nixlib-e645ecf78105522c155bd180edfd425ad463faec.tar.lz
nixlib-e645ecf78105522c155bd180edfd425ad463faec.tar.xz
nixlib-e645ecf78105522c155bd180edfd425ad463faec.tar.zst
nixlib-e645ecf78105522c155bd180edfd425ad463faec.zip
Merge pull request #31960 from mikoim/fonts/inconsolata
inconsolata: 1.010 -> inherit google-fonts
-rw-r--r--pkgs/data/fonts/inconsolata/default.nix16
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index 13aeae803124..e1544787b726 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchzip }:
+{ stdenv, google-fonts }:
 
-let
-  version = "1.010";
-in fetchzip {
+stdenv.mkDerivation rec {
   name = "inconsolata-${version}";
 
-  url = "http://www.levien.com/type/myfonts/Inconsolata.otf";
+  inherit (google-fonts) src version;
 
-  postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf";
-
-  sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7";
+  installPhase = ''
+    install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.levien.com/type/myfonts/inconsolata.html;
     description = "A monospace font for both screen and print";
-    maintainers = with maintainers; [ raskin rycee ];
+    maintainers = with maintainers; [ mikoim raskin rycee ];
     license = licenses.ofl;
     platforms = platforms.all;
   };