diff options
| author | Peter Simons <simons@cryp.to> | 2012-04-28 14:14:16 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-04-28 14:14:16 +0000 |
| commit | 6c37520d2a0a0a01a066b23e11aaff8bd2b28deb (patch) | |
| tree | dce12504fa85d05b5368a6c94d69d7c49a9c2bd2 /pkgs/development/python-modules/numpy | |
| parent | ce7f9e1d14ccbf5223e358772dbb922c172d78c9 (diff) | |
| download | nixlib-6c37520d2a0a0a01a066b23e11aaff8bd2b28deb.tar nixlib-6c37520d2a0a0a01a066b23e11aaff8bd2b28deb.tar.gz nixlib-6c37520d2a0a0a01a066b23e11aaff8bd2b28deb.tar.bz2 nixlib-6c37520d2a0a0a01a066b23e11aaff8bd2b28deb.tar.lz nixlib-6c37520d2a0a0a01a066b23e11aaff8bd2b28deb.tar.xz nixlib-6c37520d2a0a0a01a066b23e11aaff8bd2b28deb.tar.zst nixlib-6c37520d2a0a0a01a066b23e11aaff8bd2b28deb.zip | |
numpy: fixed build (patch by Konrad Hinsen)
svn path=/nixpkgs/trunk/; revision=33941
Diffstat (limited to 'pkgs/development/python-modules/numpy')
| -rw-r--r-- | pkgs/development/python-modules/numpy/no_default_dirs.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/numpy/no_default_dirs.patch b/pkgs/development/python-modules/numpy/no_default_dirs.patch new file mode 100644 index 000000000000..8e1f58974f5c --- /dev/null +++ b/pkgs/development/python-modules/numpy/no_default_dirs.patch @@ -0,0 +1,28 @@ +diff -ur numpy-1.6.1-orig/numpy/distutils/system_info.py numpy-1.6.1/numpy/distutils/system_info.py +--- numpy-1.6.1-orig/numpy/distutils/system_info.py 2011-07-01 17:31:13.000000000 -0400 ++++ numpy-1.6.1/numpy/distutils/system_info.py 2012-04-27 14:10:38.000000000 -0400 +@@ -189,18 +189,12 @@ + default_x11_lib_dirs = [] + default_x11_include_dirs = [] + else: +- default_lib_dirs = libpaths(['/usr/local/lib','/opt/lib','/usr/lib', +- '/opt/local/lib','/sw/lib'], platform_bits) +- default_include_dirs = ['/usr/local/include', +- '/opt/include', '/usr/include', +- '/opt/local/include', '/sw/include', +- '/usr/include/suitesparse'] +- default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] +- +- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib','/usr/X11/lib', +- '/usr/lib'], platform_bits) +- default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include', +- '/usr/include'] ++ default_lib_dirs = [] ++ default_include_dirs = [] ++ default_src_dirs = ['.'] ++ ++ default_x11_lib_dirs = [] ++ default_x11_include_dirs = [] + + if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: + default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib')) |