public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freetype: Update to 2.4.12 

Also update the Infinality patches.

Note that FreeType 2.5 was released a few days ago, but I don't know
how stable it is.
This commit is contained in:
Eelco Dolstra 2013-06-21 18:44:33 +02:00
parent a0ba1a20e9
commit 143473406f
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/fontconfig/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
infinality_patch = with freetype.infinality; if useInfinality infinality_patch = with freetype.infinality; if useInfinality
then let subvers = "1"; then let subvers = "1";
in fetchurl { in fetchurl {
url = "${base_URL}/fontconfig-infinality-1-${vers}_${subvers}.tar.bz2"; url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;
sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";
} }
else null; else null;

24
pkgs/development/libraries/freetype/default.nix
View File

@ -10,17 +10,7 @@ assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense
let let
version = "2.4.11"; version = "2.4.12";
infinality = rec {
inherit useInfinality;
vers = "20130104";
subvers = "04";
sha256 = "0dqglig34lfcw0w6sm6vmich0pcvq303vyh8jzqapvxgvrpr2156";
base_URL = "http://www.infinality.net/fedora/linux/zips";
url = "${base_URL}/freetype-infinality-${version}-${vers}_${subvers}-x86_64.tar.bz2";
};
in in
@ -29,12 +19,14 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/freetype/${name}.tar.bz2"; url = "mirror://sourceforge/freetype/${name}.tar.bz2";
sha256 = "0gxyzxqpyf8g85y6g1zc1wqrh71prbbk8xfw4m8rwzb4ck5hp7gg"; sha256 = "10akr2c37iv9y7fkgwp2szgwjyl2g6qmk9z1m596iaw9cr41g2m7";
}; };
infinality_patch = if useInfinality infinality_patch =
then fetchurl { inherit (infinality) url sha256; } if useInfinality then fetchurl {
else null; url = http://www.infinality.net/fedora/linux/zips/freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2;
sha256 = "1lg2nzvxmwzwdfhxranw8iyflhr72cw9p11rkpgq1scxbp37668m";
} else null;
configureFlags = "--disable-static"; configureFlags = "--disable-static";
@ -68,7 +60,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-static CC_BUILD=gcc"; configureFlags = "--disable-static CC_BUILD=gcc";
}; };
passthru = { inherit infinality; }; # for fontconfig passthru.infinality.useInfinality = useInfinality; # for fontconfig
meta = { meta = {
description = "A font rendering engine"; description = "A font rendering engine";