diff options
| author | volth <volth@volth.com> | 2019-06-07 09:22:48 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-06-07 09:22:48 +0000 |
| commit | a556fbf3e5c49ad8aacedab78c3305dbbb865196 (patch) | |
| tree | 0c7c24cdcb9b7d431b269d237834bafd3a135948 /pkgs/development/libraries/beignet | |
| parent | 0e85810cab54dbacc8abdf8ff08b4bc04cb618fe (diff) | |
| download | nixpkgs-a556fbf3e5c49ad8aacedab78c3305dbbb865196.tar nixpkgs-a556fbf3e5c49ad8aacedab78c3305dbbb865196.tar.gz nixpkgs-a556fbf3e5c49ad8aacedab78c3305dbbb865196.tar.bz2 nixpkgs-a556fbf3e5c49ad8aacedab78c3305dbbb865196.tar.lz nixpkgs-a556fbf3e5c49ad8aacedab78c3305dbbb865196.tar.xz nixpkgs-a556fbf3e5c49ad8aacedab78c3305dbbb865196.tar.zst nixpkgs-a556fbf3e5c49ad8aacedab78c3305dbbb865196.zip | |
beignet: 1.3.2 -> unstable-2018.08.20
Diffstat (limited to 'pkgs/development/libraries/beignet')
| -rw-r--r-- | pkgs/development/libraries/beignet/clang_llvm.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/beignet/default.nix | 17 |
2 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/development/libraries/beignet/clang_llvm.patch b/pkgs/development/libraries/beignet/clang_llvm.patch index 88876f157cd..bcdad510e10 100644 --- a/pkgs/development/libraries/beignet/clang_llvm.patch +++ b/pkgs/development/libraries/beignet/clang_llvm.patch @@ -47,16 +47,3 @@ index a148321..96cafb8 100644 set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB}) unset(CLANG_LIB CACHE) endmacro() -diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt -index 88985d7..01bca9e 100644 ---- a/./CMakeLists.txt -+++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt -@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND) - "intel-beignet.icd.in" - "${ICD_FILE_NAME}" - ) -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) -+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors) - ELSE(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - not found") - ENDIF(OCLIcd_FOUND) diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index ba6fc7cb541..05ff5593205 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchFromGitHub , cmake , pkgconfig , clang-unwrapped @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { name = "beignet-${version}"; - version = "1.3.2"; + version = "unstable-2018.08.20"; - src = fetchurl { - url = "https://01.org/sites/default/files/${name}-source.tar.gz"; - sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5"; + src = fetchFromGitHub { + owner = "intel"; + repo = "beignet"; + rev = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c"; + sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h"; }; patches = [ ./clang_llvm.patch ]; @@ -31,6 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postPatch = '' + substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" patchShebangs src/git_sha1.sh ''; @@ -101,8 +104,8 @@ stdenv.mkDerivation rec { homepage = https://cgit.freedesktop.org/beignet/; description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; longDescription = '' - The package provides an open source implementation of the OpenCL specification for Intel GPUs. - It supports the Intel OpenCL runtime library and compiler. + The package provides an open source implementation of the OpenCL specification for Intel GPUs. + It supports the Intel OpenCL runtime library and compiler. ''; license = licenses.lgpl21Plus; maintainers = with maintainers; [ artuuge zimbatm ]; |