diff options
| author | Stefan Matting <stefan.matting@gmail.com> | 2018-05-13 14:17:32 +0200 |
|---|---|---|
| committer | Stefan Matting <stefan.matting@gmail.com> | 2018-05-13 14:19:16 +0200 |
| commit | 6d8bf113bd9630c7671065871b5b60a4127ec985 (patch) | |
| tree | 752277548a62e71b18f97b35da7d02fabb888e0d /pkgs | |
| parent | a2981671523416ad5c9a49de8c16ac8fccb2306b (diff) | |
| download | nixlib-6d8bf113bd9630c7671065871b5b60a4127ec985.tar nixlib-6d8bf113bd9630c7671065871b5b60a4127ec985.tar.gz nixlib-6d8bf113bd9630c7671065871b5b60a4127ec985.tar.bz2 nixlib-6d8bf113bd9630c7671065871b5b60a4127ec985.tar.lz nixlib-6d8bf113bd9630c7671065871b5b60a4127ec985.tar.xz nixlib-6d8bf113bd9630c7671065871b5b60a4127ec985.tar.zst nixlib-6d8bf113bd9630c7671065871b5b60a4127ec985.zip | |
libgpuarray: add nvidia_x11 as dependency when cudaSupport
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/libgpuarray/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 26fe33995ed8..14e83584678c 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -9,10 +9,13 @@ , nose , Mako , python -, cudaSupport ? false, cudatoolkit +, cudaSupport ? false, cudatoolkit , nvidia_x11 , openclSupport ? true, ocl-icd, clblas }: +assert cudaSupport -> nvidia_x11 != null + && cudatoolkit != null; + buildPythonPackage rec { pname = "libgpuarray"; version = "0.7.5"; @@ -32,7 +35,7 @@ buildPythonPackage rec { 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) ); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9033c3d825d..ce520ca71193 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7114,6 +7114,7 @@ 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; }; librepo = toPythonModule (pkgs.librepo.override { |