From a921167e37c19082f7cee1d20bd258fb7bc9d97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 22 Sep 2015 18:44:16 +0200
Subject: [PATCH] pixman: bugfix update 0.32.6 -> 0.32.8, refactor

It's claimed to be important on i686.
http://cgit.freedesktop.org/pixman/commit/?id=8b49d4b6b460d0c92
---
 pkgs/development/libraries/pixman/default.nix | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index ce027a0a2690..30cceb59c00a 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,26 +1,28 @@
-{ fetchurl, stdenv, pkgconfig, perl, libpng, glib /*just passthru*/ }:
+{ fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.32.6";
+  name = "pixman-0.32.8";
 
   src = fetchurl {
-    url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "0129g4zdrw5hif5783li7rzcr4vpbc2cfia91azxmsk0h0xx3zix";
+    url = "mirror://xorg/individual/lib/${name}.tar.bz2";
+    sha1 = "5c57045622265b877c9bf02d531973eadf942140";
   };
 
-  nativeBuildInputs = [ pkgconfig perl ];
-
-  buildInputs = [ libpng ]; # NOT in closure anyway
-
-  postInstall = glib.flattenInclude;
-
   patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch;
 
-  configureFlags = if stdenv.isArm then ["--disable-arm-iwmmxt"] else null;
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = stdenv.lib.optional doCheck libpng;
 
-  meta = {
+  configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt";
+
+  doCheck = true;
+
+  postInstall = glib.flattenInclude;
+
+  meta = with stdenv.lib; {
     homepage = http://pixman.org;
     description = "A low-level library for pixel manipulation";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    platforms = platforms.all;
   };
 }