From e4703919881f17b4778692643e4fe84543a889db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 20 May 2014 12:42:39 +0200
Subject: [PATCH] pycairo: fix for python-3.4 by LFS patches

Fixes #2693.
---
 .../python-modules/pycairo/default.nix        | 25 +++++++++++++++----
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 54a50a2b71f..3dc64f68129 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
+{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11 }:
 
 stdenv.mkDerivation rec {
   version = "1.10.0";
@@ -13,12 +13,27 @@ stdenv.mkDerivation rec {
       sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k";
     };
 
+  patches = [(fetchpatch {
+    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch;
+    sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd";
+  })];
+
+  patch_waf = fetchpatch {
+    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch;
+    sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";
+  };
+
   buildInputs = [ python pkgconfig cairo x11 ];
-  preConfigure = ''
-    sed -e 's@#!/usr/bin/env python@#!${python.executable}@' -i waf
-    head waf
+
+  configurePhase = ''
+    (
+      cd $(${python.executable} waf unpack)
+      pwd
+      patch -p1 < ${patch_waf}
+    )
+
+    ${python.executable} waf configure --prefix=$out
   '';
-  configurePhase = "${python.executable} waf configure --prefix=$out";
   buildPhase = "${python.executable} waf";
   installPhase = "${python.executable} waf install";
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f2d5f8d823..4f0c07bd82d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -100,7 +100,7 @@ rec {
   };
 
   pycairo = import ../development/python-modules/pycairo {
-    inherit (pkgs) stdenv fetchurl pkgconfig cairo x11;
+    inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11;
     inherit python;
   };