dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libclc: 11.0.1 -> 12.0.1

Browse Source 
As part of the upgrade to 12.0.1, now 2 SPIR-V libraries will now be
made available:

 * spirv64-mesa3d-.spv
 * spirv-mesa3d-.spv

Signed-off-by: Jordan Justen <jljusten@gmail.com>
This commit is contained in:
Jordan Justen 2022-03-03 01:18:17 -08:00
parent 266b01d1d4
commit 155dbcfc81
No known key found for this signature in database
GPG Key ID: 37F99F68CAF992EB
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libclc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }:
{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages, spirv-llvm-translator }:
let
llvm = llvmPackages.llvm;
@ -7,13 +7,13 @@ in
stdenv.mkDerivation rec {
pname = "libclc";
version = "11.0.1";
version = "12.0.1";
src = fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
rev = "llvmorg-${version}";
sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags";
sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv";
};
sourceRoot = "source/libclc";
@ -21,10 +21,12 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )'
'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' \
--replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
'';
nativeBuildInputs = [ cmake ninja python3 ];
nativeBuildInputs = [ cmake ninja python3 spirv-llvm-translator ];
buildInputs = [ llvm clang-unwrapped ];
strictDeps = true;
cmakeFlags = [