b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #238129 from alexfmpe/ispc-darwin

Browse source
This commit is contained in:
Janik 2023-06-27 16:50:21 +02:00 committed by GitHub
parent 1fab0a6526 cfe665eb26
commit 04294b836c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/compilers/ispc/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode
# the default test target is sse4, but that is not supported by all Hydra agents
, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc=";
};
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ];
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
buildInputs = with llvmPackages; [
libllvm libclang openmp ncurses
];
@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
inherit testedTargets;
# needs 'transcendentals' executable, which is only on linux
doCheck = stdenv.isLinux;
doCheck = true;
# the compiler enforces -Werror, and -fno-strict-overflow makes it mad.
# hilariously this is something of a double negative: 'disable' the
@ -60,6 +59,8 @@ stdenv.mkDerivation rec {
"-DISPC_INCLUDE_UTILS=OFF"
("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE"))
("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE"))
] ++ lib.lists.optionals stdenv.isDarwin [
"-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
];
meta = with lib; {

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

@ -21582,6 +21582,7 @@ with pkgs;
ispc = callPackage ../development/compilers/ispc {
inherit (llvmPackages) stdenv;
xcode = darwin.xcode_14;
};
isso = callPackage ../servers/isso {