summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-06-11 01:41:44 +0300
committerNikolay Amiantov <ab@fmap.me>2016-06-11 02:43:44 +0300
commit9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed (patch)
tree045f579837dd6a58b6392dc550ba493de7672775 /pkgs/tools
parent5dc116e4566b360720ea78a9901ebd785fe27d43 (diff)
downloadnixpkgs-9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed.tar
nixpkgs-9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed.tar.gz
nixpkgs-9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed.tar.bz2
nixpkgs-9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed.tar.lz
nixpkgs-9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed.tar.xz
nixpkgs-9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed.tar.zst
nixpkgs-9a1d6fe7011fc940ffa8e7f196018e2fc977c7ed.zip
fontforge: 20150824 -> 20160404
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/fontforge/default.nix19
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 9ee3eb23e0e..0d6cfb19c34 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, fetchpatch, lib
+{ stdenv, fetchFromGitHub, fetchpatch, lib
 , autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
 , withGTK ? false, gtk2
-, withPython ? false # python-scripting was breaking inconsolata and libertine builds
+, withPython ? true
 }:
 
-let
-  version = "20150824"; # also tagged v2.1.0
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "fontforge-${version}";
+  version = "20160404";
 
-  src = fetchurl {
-    url = "https://github.com/fontforge/fontforge/archive/${version}.tar.gz";
-    sha256 = "09zzg166lw5ldbzsa2j9x7hizn6y3ld1kf4abfkiy301rdqj9ar8";
+  src = fetchFromGitHub {
+    owner = "fontforge";
+    repo = "fontforge";
+    rev = version;
+    sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0";
   };
 
   patches = [(fetchpatch {