From e75fe2e528d745610eb4924e418aee0d85cc582f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Nov 2014 20:26:22 +0100
Subject: [PATCH] cairo: pull an upstream patch to fix racket

Close #5165, #5166.
Also enableParallelBuilding in racket.
---
 pkgs/development/interpreters/racket/default.nix | 1 +
 pkgs/development/libraries/cairo/default.nix     | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index b626c8a1539..af6cf4b1956 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
 
   NIX_LDFLAGS = "-lgcc_s";
+  enableParallelBuilding = true;
 
   postInstall = ''
     for p in $(ls $out/bin/) ; do
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index dd73858c3fc..97e455b1f30 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libiconvOrEmpty, libintlOrEmpty
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconvOrEmpty, libintlOrEmpty
 , expat, zlib, libpng, pixman, fontconfig, freetype, xlibs
 , gobjectSupport ? true, glib
 , xcbSupport ? true # no longer experimental since 1.12
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
     sha1 = "53cf589b983412ea7f78feee2e1ba9cea6e3ebae";
   };
 
+  patches = [(fetchpatch {
+    name = "fix-racket.diff";
+    url = "http://cgit.freedesktop.org/cairo/patch/?id=2de69581c28bf115852037ca41eba13cb7335976";
+    sha256 = "0mk2fd9fwxqzravlmnbbrzwak15wqspn7609y0yn6qh87va5i0x4";
+  })];
+
   nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty;
 
   propagatedBuildInputs =