From 0d8bea54e069c916858f1f57403819e2dacc0b09 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 28 Feb 2012 00:07:05 +0000
Subject: [PATCH] Revert "Trying to fix the tarball, related to a problem
 introduced in 32596."

This reverts commit d5172b093cb152e150620eee36141dcf7feb259d.

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

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