b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #62993 from volth/beignet-2018

Browse source 
beignet: 1.3.2 -> unstable-2018.08.20
This commit is contained in:
Michael Raskin 2019-06-11 21:51:50 +00:00 committed by GitHub
parent 4e74a13fcb a556fbf3e5
commit da6a07817e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/beignet/clang_llvm.patch
View file

@ -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)

17
pkgs/development/libraries/beignet/default.nix
View file

@ -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 ];

2
pkgs/top-level/all-packages.nix
View file

@ -9935,7 +9935,7 @@ in
belr = callPackage ../development/libraries/belr { };
beignet = callPackage ../development/libraries/beignet {
inherit (llvmPackages_39) llvm clang-unwrapped;
inherit (llvmPackages_6) llvm clang-unwrapped;
};
belle-sip = callPackage ../development/libraries/belle-sip { };