public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118418 from erictapen/ispc-1.15.0 

ispc: 1.13.0 -> unstable-2021-04-02
This commit is contained in:
Sandro 2021-04-05 18:32:11 +02:00 committed by GitHub
parent d8158eee77 92e64428d1
commit 5d2f7bcfe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/ispc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, which, m4, python3, bison, flex, llvmPackages , cmake, which, m4, python3, bison, flex, llvmPackages
# the default test target is sse4, but that is not supported by all Hydra agents # the default test target is sse4, but that is not supported by all Hydra agents
@ -7,15 +7,27 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ispc"; pname = "ispc";
version = "1.13.0"; version = "unstable-2021-04-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; # ISPC release 1.15.0 doesn't build against LLVM 11.1, only against 11.0. So we
sha256 = "1l74xkpwwxc38k2ngg7mpvswziiy91yxslgfad6688hh1n5jvayd"; # use latest ISPC main branch for now, until they support an LLVM version we have.
# https://github.com/ispc/ispc/issues/2027#issuecomment-784470530
rev = "3e8313568265d2adfbf95bd6b6e1a4c70ef59bed";
sha256 = "sha256-gvr+VpoacmwQlP5gT4MnfmKdACZWJduVMIpR0YRzseg=";
}; };
patches = [
# Fix cmake error: `Failed to find clang++`
# https://github.com/ispc/ispc/pull/2055
(fetchpatch {
url = "https://github.com/erictapen/ispc/commit/338119b2f4e11fcf0b0852de296c320928e572a2.patch";
sha256 = "sha256-+RqDq1LMWomu/K4SgK0Nip47b1RwyM6W0cTSNGD4+m4=";
})
];
nativeBuildInputs = [ cmake which m4 bison flex python3 ]; nativeBuildInputs = [ cmake which m4 bison flex python3 ];
buildInputs = with llvmPackages; [ buildInputs = with llvmPackages; [
# we need to link against libclang, so we need the unwrapped # we need to link against libclang, so we need the unwrapped
@ -55,6 +67,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang"
"-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++"
"-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_EXAMPLES=OFF"
"-DISPC_INCLUDE_UTILS=OFF" "-DISPC_INCLUDE_UTILS=OFF"
"-DARM_ENABLED=FALSE" "-DARM_ENABLED=FALSE"

4
pkgs/top-level/all-packages.nix
View File

@ -14888,8 +14888,8 @@ in
iso-flags = callPackage ../data/icons/iso-flags { }; iso-flags = callPackage ../data/icons/iso-flags { };
ispc = callPackage ../development/compilers/ispc { ispc = callPackage ../development/compilers/ispc {
stdenv = llvmPackages_10.stdenv; stdenv = llvmPackages_11.stdenv;
llvmPackages = llvmPackages_10; llvmPackages = llvmPackages_11;
}; };
isso = callPackage ../servers/isso { }; isso = callPackage ../servers/isso { };