public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgpuarray: add nvidia_x11 as dependency when cudaSupport

This commit is contained in:
Stefan Matting 2018-05-13 14:17:32 +02:00
parent a298167152
commit 6d8bf113bd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/python-modules/libgpuarray/default.nix
View File

@ -9,10 +9,13 @@
, nose , nose
, Mako , Mako
, python , python
, cudaSupport ? false, cudatoolkit , cudaSupport ? false, cudatoolkit , nvidia_x11
, openclSupport ? true, ocl-icd, clblas , openclSupport ? true, ocl-icd, clblas
}: }:
assert cudaSupport -> nvidia_x11 != null
&& cudatoolkit != null;
buildPythonPackage rec { buildPythonPackage rec {
pname = "libgpuarray"; pname = "libgpuarray";
version = "0.7.5"; version = "0.7.5";
@ -32,7 +35,7 @@ buildPythonPackage rec {
libraryPath = lib.makeLibraryPath ( libraryPath = lib.makeLibraryPath (
[] []
++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out nvidia_x11 ]
++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd)
); );

1
pkgs/top-level/python-packages.nix
View File

@ -7114,6 +7114,7 @@ in {
libgpuarray = callPackage ../development/python-modules/libgpuarray { libgpuarray = callPackage ../development/python-modules/libgpuarray {
clblas = pkgs.clblas.override { boost = self.boost; }; clblas = pkgs.clblas.override { boost = self.boost; };
cudaSupport = pkgs.config.cudaSupport or false; cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
}; };
librepo = toPythonModule (pkgs.librepo.override { librepo = toPythonModule (pkgs.librepo.override {