about summary refs log tree commit diff
path: root/pkgs/development/python-modules/numpy
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2012-05-09 07:22:18 +0000
committerPeter Simons <simons@cryp.to>2012-05-09 07:22:18 +0000
commit1cdbd5add0ab86311292dacfeb466812e2e4a4b5 (patch)
tree0b4184d1f8e655f1f459ace4ce1239eb5b7fe452 /pkgs/development/python-modules/numpy
parentb713e291a47c68f478b84e4fd9324e3f4bf45d4d (diff)
downloadnixlib-1cdbd5add0ab86311292dacfeb466812e2e4a4b5.tar
nixlib-1cdbd5add0ab86311292dacfeb466812e2e4a4b5.tar.gz
nixlib-1cdbd5add0ab86311292dacfeb466812e2e4a4b5.tar.bz2
nixlib-1cdbd5add0ab86311292dacfeb466812e2e4a4b5.tar.lz
nixlib-1cdbd5add0ab86311292dacfeb466812e2e4a4b5.tar.xz
nixlib-1cdbd5add0ab86311292dacfeb466812e2e4a4b5.tar.zst
nixlib-1cdbd5add0ab86311292dacfeb466812e2e4a4b5.zip
numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen
The patch broke the build of matplotlib.

svn path=/nixpkgs/trunk/; revision=34023
Diffstat (limited to 'pkgs/development/python-modules/numpy')
-rw-r--r--pkgs/development/python-modules/numpy/no_default_dirs.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/pkgs/development/python-modules/numpy/no_default_dirs.patch b/pkgs/development/python-modules/numpy/no_default_dirs.patch
deleted file mode 100644
index 8e1f58974f5c..000000000000
--- a/pkgs/development/python-modules/numpy/no_default_dirs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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'))