pyrox.dev
Merge pull request #252065 from alexfmpe/ispc-1.20
ispc: 1.19.0 -> 1.20.0
authored by
Matthias Beyer
and committed by
GitHub
524fb0db
4fe8cb23
+8
-5
pkgs/development/compilers/ispc/default.nix
+8
-5
pkgs/development/compilers/ispc/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, fetchpatch
2
-
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode
3
-
2
+
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb
4
3
# the default test target is sse4, but that is not supported by all Hydra agents
5
4
, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
6
5
}:
7
6
8
7
stdenv.mkDerivation rec {
9
8
pname = "ispc";
10
-
version = "1.19.0";
9
+
version = "1.20.0";
11
10
12
11
src = fetchFromGitHub {
13
12
owner = pname;
14
13
repo = pname;
15
14
rev = "v${version}";
16
-
sha256 = "sha256:0yhcgyzjlrgs920lm0l6kygj2skanfb6qkxbdgm69r8c2xkzkaa3";
15
+
sha256 = "sha256:06wgvfbc6nh5c7yili47h2gzl0ykcwnvyizy499kb6gsplflf9gh";
17
16
};
18
17
19
-
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
18
+
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
19
+
20
20
buildInputs = with llvmPackages; [
21
21
libllvm libclang openmp ncurses
22
22
];
···
52
52
'';
53
53
54
54
cmakeFlags = [
55
+
"-DFILE_CHECK_EXECUTABLE=${llvmPackages.llvm}/bin/FileCheck"
56
+
"-DLLVM_AS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-as"
55
57
"-DLLVM_CONFIG_EXECUTABLE=${llvmPackages.llvm.dev}/bin/llvm-config"
58
+
"-DLLVM_DIS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-dis"
56
59
"-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang"
57
60
"-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++"
58
61
"-DISPC_INCLUDE_EXAMPLES=OFF"
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix