diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-09 00:41:27 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-09 00:41:27 +0200 |
| commit | 99b88cfb5354337ec55e38ae8d42fb08dc14d25b (patch) | |
| tree | 19336faadeb27fb06dca63cf47d0d0db4a07729b /pkgs/development/libraries/freetype | |
| parent | 61129e1ee9a37d75f2f26c8eb5de1c984766a461 (diff) | |
| parent | 8c4a613f3a478c1cb2994fb9df3b0eb92d4c7885 (diff) | |
| download | nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.gz nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.bz2 nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.lz nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.xz nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.zst nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.zip | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts: pkgs/development/libraries/acl/default.nix pkgs/development/libraries/atk/2.6.x.nix pkgs/development/libraries/attr/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/2.34.x.nix pkgs/development/libraries/gtk+/2.24.x.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/openssl/default.nix pkgs/development/libraries/pango/1.30.x.nix pkgs/misc/cups/default.nix pkgs/os-specific/linux/util-linux/default.nix pkgs/servers/x11/xorg/builder.sh pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8d4e769060a..4c695ab3345 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -6,32 +6,42 @@ }: stdenv.mkDerivation rec { - name = "freetype-2.4.4"; + name = "freetype-2.4.10"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb"; + sha256 = "0bwrkqpygayfc1rf6rr1nb8l3svgn1fmjz8davg2hnf46cn293hc"; }; outputs = [ "dev" "out" ]; configureFlags = "--disable-static --bindir=$(dev)/bin"; - # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1"; # 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.isLinux) gnumake; + + enableParallelBuilding = true; + postInstall = '' mkdir $dev/lib mv $out/lib/pkgconfig $dev/lib/ + ln -s freetype2/freetype $dev/include/freetype ''; + crossAttrs = { + # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead + # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't + # know why it's on the PATH. + configureFlags = "--disable-static CC_BUILD=gcc"; + }; + meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; |