pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
|
||||
, opencl-clhpp, ocl-icd, fftw, fftwFloat
|
||||
, blas, lapack, boost, mesa, libGLU, libGL
|
||||
, freeimage, python, clfft, clblas
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
"-DAF_BUILD_OPENCL=OFF"
|
||||
"-DAF_BUILD_EXAMPLES=OFF"
|
||||
"-DBUILD_TESTING=OFF"
|
||||
] ++ stdenv.lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs";
|
||||
] ++ lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs";
|
||||
|
||||
patches = [ ./no-download.patch ];
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp
|
||||
'';
|
||||
|
||||
preBuild = stdenv.lib.optionalString cudaSupport ''
|
||||
preBuild = lib.optionalString cudaSupport ''
|
||||
export CUDA_PATH="${cudatoolkit}"
|
||||
'';
|
||||
|
||||
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
|
||||
libGLU libGL
|
||||
mesa freeimage
|
||||
boost.out boost.dev
|
||||
] ++ (stdenv.lib.optional stdenv.isLinux ocl-icd)
|
||||
++ (stdenv.lib.optional cudaSupport cudatoolkit)
|
||||
++ (stdenv.lib.optional buildDocs doxygen);
|
||||
] ++ (lib.optional stdenv.isLinux ocl-icd)
|
||||
++ (lib.optional cudaSupport cudatoolkit)
|
||||
++ (lib.optional buildDocs doxygen);
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A general-purpose library for parallel and massively-parallel computations";
|
||||
longDescription = ''
|
||||
A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.";
|
||||
|
||||
Reference in New Issue
Block a user