From fc9f42487eefad89df7ff2509c197a4568bacf4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 21:40:37 +0000
Subject: [PATCH] Trying to fix the tarball, related to a problem introduced in
 32596.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32606
---
 pkgs/top-level/python-packages.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49e3901aa7b..6cd2c4cb61b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -674,12 +674,15 @@ let pythonPackages = python.modules // rec {
 
     configureFlags = "--with-python=${python}";
 
-    postConfigure = ''
-      cd python
-      sed -i setup.py \
-          -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \
-          -e "s:^iconv_includes.*:iconv_includes= r'${pkgs.libxml2.libiconv}':"
-    '';
+    postConfigure = let
+      changeIconv = "-e s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':";
+    in
+      ''
+        cd python
+        sed -i setup.py \
+            -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \
+            ${if pkgs.libxml2.libiconv != null then changeIconv else ""}
+      '';
 
     # has no tests
     doCheck = false;