Unverified Commit 58d11d3f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #230200 from elliottslaughter/terra-1.1.0 

terra: 1.0.6 -> 1.1.0
parents c6168667 525656f7

pkgs/development/compilers/terra/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ let 


in stdenv.mkDerivation rec {

  pname = "terra";

  version = "1.0.6";

  version = "1.1.0";



  src = fetchFromGitHub {

    owner = "terralang";

    repo = "terra";

    rev = "release-${version}";

    sha256 = "1bs76ibzb469rlqs7slw8pm65csjq1nf0lqh6i9kcvbzavmdfds7";

    sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd";

  };



  nativeBuildInputs = [ cmake ];
@@ -50,6 +50,7 @@ in stdenv.mkDerivation rec { 
    "-DHAS_TERRA_VERSION=0"

    "-DTERRA_VERSION=${version}"

    "-DTERRA_LUA=luajit"

    "-DTERRA_SKIP_LUA_DOWNLOAD=ON"

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

  ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";
@@ -60,9 +61,6 @@ in stdenv.mkDerivation rec { 
  patches = [ ./nix-cflags.patch ];



  postPatch = ''

    sed -i '/file(DOWNLOAD "''${LUAJIT_URL}" "''${LUAJIT_TAR}")/d' \

      cmake/Modules/GetLuaJIT.cmake



    substituteInPlace src/terralib.lua \

      --subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include

  '';