dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ispc: drop impure Xcode dependency (#351544)

Browse Source
This commit is contained in:
Randy Eckenrode 2024-10-26 20:41:00 -04:00 committed by GitHub
commit e70b04b004
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb , cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, tbb
# 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
, testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] , testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q=";
}; };
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ]; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];
buildInputs = with llvmPackages; [ buildInputs = with llvmPackages; [
libllvm libclang openmp ncurses libllvm libclang openmp ncurses
@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
"-DISPC_INCLUDE_UTILS=OFF" "-DISPC_INCLUDE_UTILS=OFF"
("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE")) ("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE"))
("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE")) ("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE"))
] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [
"-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
]; ];
meta = with lib; { meta = with lib; {

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

@ -20299,7 +20299,6 @@ with pkgs;
isort = with python3Packages; toPythonApplication isort; isort = with python3Packages; toPythonApplication isort;
ispc = callPackage ../development/compilers/ispc { ispc = callPackage ../development/compilers/ispc {
xcode = darwin.xcode_14;
llvmPackages = llvmPackages_17; llvmPackages = llvmPackages_17;
}; };