terra: 1.0.6 -> 1.1.0

This commit is contained in:
Elliott Slaughter 2023-05-05 14:07:08 -07:00
parent de2b517573
commit 525656f7a2

View file

@ -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
'';