summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2013-11-28 02:52:12 -0800
committerMichael Raskin <7c6f434c@mail.ru>2013-11-28 02:52:12 -0800
commite17df71e2b0099c821e0fba293202c8869778867 (patch)
tree3553c0cdd03d425bf223b05a856f3eb07b043b02 /pkgs/data
parent4d416e58b7c0ded6d1a39fa625eadd13de9ba6fb (diff)
parent0d18b8169ed873a3eaab39009662478f2cd547d3 (diff)
downloadnixlib-e17df71e2b0099c821e0fba293202c8869778867.tar
nixlib-e17df71e2b0099c821e0fba293202c8869778867.tar.gz
nixlib-e17df71e2b0099c821e0fba293202c8869778867.tar.bz2
nixlib-e17df71e2b0099c821e0fba293202c8869778867.tar.lz
nixlib-e17df71e2b0099c821e0fba293202c8869778867.tar.xz
nixlib-e17df71e2b0099c821e0fba293202c8869778867.tar.zst
nixlib-e17df71e2b0099c821e0fba293202c8869778867.zip
Merge pull request #1289 from iyzsong/terminus-font
terminus-font: update to 4.38
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/terminus-font/default.nix27
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 039e046ed55f..3487a8012dc0 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -1,26 +1,27 @@
-{ fetchurl, stdenv, perl, bdftopcf, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }:
+
 stdenv.mkDerivation rec {
-  name = "terminus-font-4.30";
+  name = "terminus-font-4.38";
+
   src = fetchurl {
-#    urls = "http://www.is-vn.bg/hamster/${name}.tar.gz"
-#    sha256 = "ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a";
-     url = "http://ftp.de.debian.org/debian/pool/main/x/xfonts-terminus/xfonts-terminus_4.30.orig.tar.gz";
-     sha256 = "d7f1253d75f0aa278b0bbf457d15927ed3bbf2565b9f6b829c2b2560fedc1712";
+    url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
+    sha256 = "1dwpxmg0wiyhp7hh18mvw18gnf0y2jgbn80c4xya7rmb9mm8gx7n";
   };
+
   buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];
+
   patchPhase = ''
     substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
   '';
+
   configurePhase = ''
-    ./configure --prefix=$out
-  '';
-  buildPhase = ''
-    make pcf
+    sh ./configure --prefix=$out
   '';
-  installPhase = '' 
-    make install-pcf
-    make fontdir
+
+  installPhase = ''
+    make install fontdir
   '';
+
   meta = {
     description = "A clean fixed width font";
     longDescription = ''