Merge pull request #58536 from markuskowa/fix-clblas

clblas: turn of gtest, fix build
2019-03-29 16:36:02 +01:00 · 2019-03-29 16:36:02 +01:00 · 106b52bac0
commit 106b52bac0
parent cb09c5bf6a ad1e7b09c0
2 changed files with 8 additions and 9 deletions
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@ -8,7 +8,6 @@
 , ocl-icd
 , opencl-headers
 , Accelerate, CoreGraphics, CoreVideo, OpenCL
-, gtest
 }:

 stdenv.mkDerivation rec {
@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
  '';

  cmakeFlags = [
-    "-DUSE_SYSTEM_GTEST=ON"
+     "-DBUILD_TEST=OFF"
  ];

  buildInputs = [
@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
    blas
    python
    boost
-    gtest
  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
    ocl-icd
    opencl-headers
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@ -66,8 +66,9 @@ buildPythonPackage rec {

  enableParallelBuilding = true;

+  nativeBuildInputs = [ cmake ];
+
  buildInputs = [
-    cmake
    cython
    nose
  ];