Unverified Commit e28c9013 authored by a-n-n-a-l-e-e's avatar a-n-n-a-l-e-e Committed by GitHub
Browse files

Merge pull request #288959 from a-n-n-a-l-e-e/terra-unpin-llvm11 

terra: llvmPackages_11 -> llvmPackages
parents 5800af27 bb208b22

pkgs/development/compilers/terra/default.nix

+16 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2

, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false

, libobjc, Cocoa, Foundation

, libffi, libobjc, libpfm, Cocoa, Foundation

}:



let
@@ -42,16 +42,25 @@ in stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [ cmake ];

  buildInputs = [ llvmMerged ncurses libxml2 ]

  buildInputs = [ llvmMerged ncurses libffi libxml2 ]

    ++ lib.optionals enableCUDA [ cuda ]

    ++ lib.optional (!stdenv.isDarwin) libpfm

    ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ];



  cmakeFlags = [

  cmakeFlags = let

    resourceDir = "${llvmMerged}/lib/clang/" + (

      if lib.versionOlder clangVersion "16"

      then

        clangVersion

      else

        lib.versions.major clangVersion

    );

  in [

    "-DHAS_TERRA_VERSION=0"

    "-DTERRA_VERSION=${version}"

    "-DTERRA_LUA=luajit"

    "-DTERRA_SKIP_LUA_DOWNLOAD=ON"

    "-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}"

    "-DCLANG_RESOURCE_DIR=${resourceDir}"

  ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";



  doCheck = true;
@@ -88,6 +97,8 @@ in stdenv.mkDerivation rec { 
    maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ];

    license = licenses.mit;

    # never built on aarch64-darwin since first introduction in nixpkgs

    broken = stdenv.isDarwin && stdenv.isAarch64;

    # Linux Aarch64 broken above LLVM11

    # https://github.com/terralang/terra/issues/597

    broken = stdenv.isAarch64;

  };

}

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -17213,7 +17213,6 @@ with pkgs; 
  tbb = tbb_2020_3;















  terra = callPackage ../development/compilers/terra {













    llvmPackages = llvmPackages_11;















    inherit (darwin) libobjc;















    inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;















  };