diff options
| author | Elliott Slaughter <elliottslaughter@gmail.com> | 2023-05-05 14:07:08 -0700 |
|---|---|---|
| committer | Elliott Slaughter <elliottslaughter@gmail.com> | 2023-05-05 14:07:08 -0700 |
| commit | 525656f7a25d63c8f219606c7c4cf1ed3f4cf032 (patch) | |
| tree | e591d1616383fa792f81504d12a14d6534aacf80 /pkgs/development/compilers/terra | |
| parent | de2b5175735afda5f094c20aa421e93651dc7cbb (diff) | |
terra: 1.0.6 -> 1.1.0
Diffstat (limited to 'pkgs/development/compilers/terra')
| -rw-r--r-- | pkgs/development/compilers/terra/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 815f282386432..d53441a583c38 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -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 ''; |