diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-06 00:02:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-06 00:02:53 +0000 |
commit | 4cab9aed767ddeae393205dc52fbcd9e2782f1d8 (patch) | |
tree | 4fb51c445cc5f492e0cc379fbb29228c9a70cfb7 /pkgs/development/compilers/spirv-llvm-translator | |
parent | 19d7d6417fd59a8cc1f29c01b0a9c6dd6aa97ee1 (diff) | |
parent | b962dee3e746a3c55f04bc1f8a2719db0591bf9a (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/spirv-llvm-translator')
-rw-r--r-- | pkgs/development/compilers/spirv-llvm-translator/default.nix | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 7c37c4789f4be..ecdc686ad360a 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -4,29 +4,42 @@ , pkg-config , lit , llvm_11 +, spirv-headers +, spirv-tools }: stdenv.mkDerivation rec { pname = "SPIRV-LLVM-Translator"; - version = "unstable-2021-06-13"; + version = "unstable-2022-05-04"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-LLVM-Translator"; - rev = "c67e6f26a7285aa753598ef792593ac4a545adf9"; - sha256 = "sha256-1s3lVNTQDl+pUvbzSMsp3cOUSm6I4DzqJxnLMeeE3F4="; + rev = "99420daab98998a7e36858befac9c5ed109d4920"; + sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; }; nativeBuildInputs = [ pkg-config cmake llvm_11.dev ]; - buildInputs = [ llvm_11 ]; + buildInputs = [ spirv-headers spirv-tools llvm_11 ]; checkInputs = [ lit ]; + makeFlags = [ "llvm-spirv" ]; + cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" + "-DLLVM_DIR=${llvm_11.dev}" + "-DBUILD_SHARED_LIBS=YES" + "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" ]; + prePatch = '' + substituteInPlace ./test/CMakeLists.txt \ + --replace 'SPIRV-Tools' 'SPIRV-Tools-shared' + ''; + + # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; |