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

Merge remote-tracking branch 'official/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Mathijs Kwik
2013-09-11 10:51:46 +02:00
parent 2d405ed4d5 aa8e8303e1
commit 1a55c4b89f
567 changed files with 12427 additions and 3449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/cairo/default.nix
View File

@@ -11,11 +11,11 @@ assert glSupport -> mesa_noglu != null;
with { inherit (stdenv.lib) optional optionals; };
stdenv.mkDerivation rec {
name = "cairo-1.12.14";
name = "cairo-1.12.16";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.xz";
sha256 = "04xcykglff58ygs0dkrmmnqljmpjwp2qgwcz8sijqkdpz7ix3l4n";
sha256 = "0inqwsylqkrzcjivdirkjx5nhdgxbdc62fq284c3xppinfg9a195";
};
outputs = [ "dev" "out" "bin" "doc" ];
@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
++ optional pdfSupport "--enable-pdf"
;
NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
preConfigure =
# On FreeBSD, `-ldl' doesn't exist.
(stdenv.lib.optionalString stdenv.isFreeBSD
@@ -57,6 +55,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude;
meta = {
description = "A 2D graphics library with support for multiple output devices";