diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-15 22:05:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-15 22:05:13 +0000 |
| commit | 6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51 (patch) | |
| tree | 4fd6b5a3e49118899e3b10af8f0ade1de85b88bb /pkgs/development/libraries/freetype | |
| parent | 8846bef01343963021300d4d4089ab3031197df6 (diff) | |
| download | nixlib-6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51.tar nixlib-6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51.tar.gz nixlib-6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51.tar.bz2 nixlib-6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51.tar.lz nixlib-6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51.tar.xz nixlib-6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51.tar.zst nixlib-6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51.zip | |
* FreeType updated to 2.4.9.
svn path=/nixpkgs/branches/x-updates/; revision=34131
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index e53a3c297ff1..975366a79613 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -5,12 +5,12 @@ useEncumberedCode ? false }: -stdenv.mkDerivation (rec { - name = "freetype-2.4.4"; +stdenv.mkDerivation rec { + name = "freetype-2.4.9"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb"; + sha256 = "1far9006qbw5gvjn8ph1kyfhly4j7x7vycigb8vx96cfsk0ll864"; }; configureFlags = "--disable-static"; @@ -21,16 +21,14 @@ stdenv.mkDerivation (rec { # The asm for armel is written with the 'asm' keyword. 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 = { description = "A font rendering engine"; homepage = http://www.freetype.org/; 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 {})) |