make clblas-cuda and libgpuarray-cuda more functorial

2016-06-14 20:01:51 +02:00
parent 93a11d8b0f
commit d1f38e2adc
3 changed files with 9 additions and 16 deletions
--- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix
@@ -18,8 +18,14 @@
 , python
 , cudatoolkit
 , nvidia_x11
+, setuptools
 }: 
-
+let
+  scipy_numpy = scipy.override (let inherit numpy; in {
+    passthru = { blas = numpy.blas; };
+    propagatedBuildInputs = [ numpy.blas numpy ] ++ [ python setuptools ];
+  });
+in
 buildPythonPackage rec {
  name = "libgpuarray-cuda-${version}";
  version = "-9998.0"; 
@@ -98,7 +104,7 @@ EOF

  propagatedBuildInputs = [
    numpy
-    scipy
+    scipy_numpy
    nose
    six
    Mako