diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:51:46 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:53:31 +0200 |
| commit | 1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304 (patch) | |
| tree | 3513b616eec434d455177a877119cdd96a7b4ade /pkgs/development/libraries/cairo | |
| parent | 2d405ed4d54ba4d924b5146cea4a39ae65343d59 (diff) | |
| parent | aa8e8303e1b42c5cf5195f3ce82f886664aa26d4 (diff) | |
| download | nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.gz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.bz2 nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.lz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.xz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.zst nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.zip | |
Merge remote-tracking branch 'official/master' into multiple-outputs
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
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index f971a290358..fc14e99fd09 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -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"; |