cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

spirv-llvm-translator_14: init at 14.0.0

Browse source
This commit is contained in:
PedroHLC ☭ 2022-10-22 11:46:23 -03:00
parent ea2ca5e639
commit 40ee116f25
No known key found for this signature in database
GPG key ID: F5BFC029DA9A28CE
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/spirv-llvm-translator/default.nix
View file

@ -12,7 +12,15 @@ let
llvmMajor = lib.versions.major llvm.version; llvmMajor = lib.versions.major llvm.version;
branch = branch =
if llvmMajor == "11" then { if llvmMajor == "15" then rec {
version = "15.0.0";
rev = "v${version}";
hash = "sha256-111yL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
} else if llvmMajor == "14" then rec{
version = "14.0.0";
rev = "v${version}";
hash = "sha256-BhNAApgZ/w/92XjpoDY6ZEIhSTwgJ4D3/EfNvPmNM2o=";
} else if llvmMajor == "11" then {
version = "unstable-2022-05-04"; version = "unstable-2022-05-04";
rev = "99420daab98998a7e36858befac9c5ed109d4920"; # 265 commits ahead of v11.0.0 rev = "99420daab98998a7e36858befac9c5ed109d4920"; # 265 commits ahead of v11.0.0
hash = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; hash = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
@ -41,7 +49,7 @@ stdenv.mkDerivation rec {
"-DLLVM_SPIRV_BUILD_EXTERNAL=YES" "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
# RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON" "-DCMAKE_SKIP_BUILD_RPATH=ON"
]; ] ++ lib.optionals (llvmMajor != "11") [ "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ];
# FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
doCheck = false; doCheck = false;

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

@ -15134,6 +15134,8 @@ with pkgs;
spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; };
sqldeveloper = callPackage ../development/tools/database/sqldeveloper { sqldeveloper = callPackage ../development/tools/database/sqldeveloper {
jdk = oraclejdk; jdk = oraclejdk;
}; };