public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Trying to fix the tarball, related to a problem introduced in 32596."

Browse Source 
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
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/python-packages.nix
View File

@ -674,14 +674,11 @@ let pythonPackages = python.modules // rec {
configureFlags = "--with-python=${python}"; configureFlags = "--with-python=${python}";
postConfigure = let postConfigure = ''
changeIconv = "-e s:^iconv_includes.*:iconv_includes=r'${pkgs.libxml2.libiconv}':";
in
''
cd python cd python
sed -i setup.py \ sed -i setup.py \
-e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \ -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \
${if pkgs.libxml2.libiconv != null then changeIconv else ""} -e "s:^iconv_includes.*:iconv_includes= r'${pkgs.libxml2.libiconv}':"
''; '';
# has no tests # has no tests