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
This commit is contained in:
Florian Friesdorf 2012-02-28 00:07:05 +00:00
parent 5f3d291001
commit 0d8bea54e0

View file

@ -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;