From d1f38e2adcc78cfb17f2d60c0c63dd597b3e5c90 Mon Sep 17 00:00:00 2001 From: artuuge Date: Tue, 14 Jun 2016 20:01:51 +0200 Subject: make clblas-cuda and libgpuarray-cuda more functorial --- pkgs/development/python-modules/libgpuarray/cuda/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules/libgpuarray') diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix index 70a79b76ec1..6934d9bfe6f 100644 --- 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 -- cgit v1.2.3