diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index d061356490cb..2be115ae3658 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, addOpenGLRunpath , buildPythonPackage , fetchFromGitHub , cmake @@ -8,13 +9,10 @@ , six , nose , Mako -, cudaSupport ? false, cudatoolkit , nvidia_x11 +, cudaSupport ? false, cudatoolkit , openclSupport ? true, ocl-icd, clblas }: -assert cudaSupport -> nvidia_x11 != null - && cudatoolkit != null; - buildPythonPackage rec { pname = "libgpuarray"; version = "0.7.6"; @@ -32,8 +30,7 @@ buildPythonPackage rec { configurePhase = "cmakeConfigurePhase"; libraryPath = lib.makeLibraryPath ( - [] - ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out nvidia_x11 ] + lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); @@ -55,6 +52,8 @@ buildPythonPackage rec { } fixRunPath $out/lib/libgpuarray.so + '' + lib.optionalString cudaSupport '' + addOpenGLRunpath $out/lib/libgpuarray.so ''; propagatedBuildInputs = [ @@ -63,7 +62,12 @@ buildPythonPackage rec { Mako ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals cudaSupport [ + addOpenGLRunpath + ]; + buildInputs = [ cython diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05693a9a4f48..43b3bff7906c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4138,7 +4138,6 @@ in { libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; }; libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python;