Unverified Commit 2fefc70f authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

ispc: drop impure Xcode dependency 

The new Darwin SDK pattern allows ispc to be built without requiring an
impure Xcode.
parent 9ddc3313

pkgs/development/compilers/ispc/default.nix

+2 −4
Original line number Diff line number Diff line 
{ 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

, 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=";

  };



  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; [

    libllvm libclang openmp ncurses
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec { 
    "-DISPC_INCLUDE_UTILS=OFF"

    ("-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"))

  ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [

    "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"

  ];



  meta = with lib; {

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -20312,7 +20312,6 @@ with pkgs; 
  isort = with python3Packages; toPythonApplication isort;















  ispc = callPackage ../development/compilers/ispc {













    xcode = darwin.xcode_14;















    llvmPackages = llvmPackages_17;















  };