alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #197235 from PedroHLC/spirv-llvm-translator_14-init

Browse source
This commit is contained in:
Bernardo Meurer 2022-11-04 14:48:17 +00:00 committed by GitHub
parent 7696e63fbc 40ee116f25
commit dac8adf99a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,36 +3,53 @@
, cmake
, pkg-config
, lit
, llvm_11
, llvm
, spirv-headers
, spirv-tools
}:
let
llvmMajor = lib.versions.major llvm.version;
branch =
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";
rev = "99420daab98998a7e36858befac9c5ed109d4920"; # 265 commits ahead of v11.0.0
hash = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
} else throw "Incompatible LLVM version.";
in
stdenv.mkDerivation rec {
pname = "SPIRV-LLVM-Translator";
version = "unstable-2022-05-04";
inherit (branch) version;
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-LLVM-Translator";
rev = "99420daab98998a7e36858befac9c5ed109d4920";
sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
inherit (branch) rev hash;
};
nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ];
nativeBuildInputs = [ pkg-config cmake llvm.dev spirv-tools ];
buildInputs = [ spirv-headers llvm_11 ];
buildInputs = [ spirv-headers llvm ];
checkInputs = [ lit ];
cmakeFlags = [
"-DLLVM_INCLUDE_TESTS=ON"
"-DLLVM_DIR=${llvm_11.dev}"
"-DLLVM_DIR=${llvm.dev}"
"-DBUILD_SHARED_LIBS=YES"
"-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
# RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/
"-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
doCheck = false;

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

@ -15219,6 +15219,8 @@ with pkgs;
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 {
jdk = oraclejdk;
};