ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 01:57:37 +03:00
Code Issues Projects Releases Wiki Activity

* FreeType updated to 2.4.9.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=34131
This commit is contained in:
Eelco Dolstra 2012-05-15 22:05:13 +00:00
parent 8846bef013
commit 6e6e5a0dde
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,12 +5,12 @@
useEncumberedCode ? false useEncumberedCode ? false
}: }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "freetype-2.4.4"; name = "freetype-2.4.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/freetype/${name}.tar.bz2"; url = "mirror://sourceforge/freetype/${name}.tar.bz2";
sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb"; sha256 = "1far9006qbw5gvjn8ph1kyfhly4j7x7vycigb8vx96cfsk0ll864";
}; };
configureFlags = "--disable-static"; configureFlags = "--disable-static";
@ -21,16 +21,14 @@ stdenv.mkDerivation (rec {
# The asm for armel is written with the 'asm' keyword. # The asm for armel is written with the 'asm' keyword.
CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99"; CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
# FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake;
enableParallelBuilding = true;
meta = { meta = {
description = "A font rendering engine"; description = "A font rendering engine";
homepage = http://www.freetype.org/; homepage = http://www.freetype.org/;
license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) license = "GPLv2+"; # or the FreeType License (BSD + advertising clause)
}; };
} }
//
# FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
(if stdenv.system == "i686-freebsd"
then { buildInputs = [ gnumake ]; }
else {}))