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

Merge pull request #58536 from markuskowa/fix-clblas

Browse Source 
clblas: turn of gtest, fix build
This commit is contained in:
Silvan Mosberger 2019-03-29 16:36:02 +01:00 committed by GitHub
commit 106b52bac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/science/math/clblas/default.nix
View File

@ -8,7 +8,6 @@
, ocl-icd , ocl-icd
, opencl-headers , opencl-headers
, Accelerate, CoreGraphics, CoreVideo, OpenCL , Accelerate, CoreGraphics, CoreVideo, OpenCL
, gtest
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DUSE_SYSTEM_GTEST=ON" "-DBUILD_TEST=OFF"
]; ];
buildInputs = [ buildInputs = [
@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
blas blas
python python
boost boost
gtest
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
ocl-icd ocl-icd
opencl-headers opencl-headers

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

@ -66,8 +66,9 @@ buildPythonPackage rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
cmake
cython cython
nose nose
]; ];