pyrox.dev
Merge pull request #230200 from elliottslaughter/terra-1.1.0
terra: 1.0.6 -> 1.1.0
authored by
Weijia Wang
and committed by
GitHub
58d11d3f
c6168667
+3
-5
pkgs/development/compilers/terra/default.nix
+3
-5
pkgs/development/compilers/terra/default.nix
···
32
33
in stdenv.mkDerivation rec {
34
pname = "terra";
35
-
version = "1.0.6";
36
37
src = fetchFromGitHub {
38
owner = "terralang";
39
repo = "terra";
40
rev = "release-${version}";
41
-
sha256 = "1bs76ibzb469rlqs7slw8pm65csjq1nf0lqh6i9kcvbzavmdfds7";
42
};
43
44
nativeBuildInputs = [ cmake ];
···
50
"-DHAS_TERRA_VERSION=0"
51
"-DTERRA_VERSION=${version}"
52
"-DTERRA_LUA=luajit"
53
"-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}"
54
] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";
55
···
60
patches = [ ./nix-cflags.patch ];
61
62
postPatch = ''
63
-
sed -i '/file(DOWNLOAD "''${LUAJIT_URL}" "''${LUAJIT_TAR}")/d' \
64
-
cmake/Modules/GetLuaJIT.cmake
65
-
66
substituteInPlace src/terralib.lua \
67
--subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include
68
'';
···
32
33
in stdenv.mkDerivation rec {
34
pname = "terra";
35
+
version = "1.1.0";
36
37
src = fetchFromGitHub {
38
owner = "terralang";
39
repo = "terra";
40
rev = "release-${version}";
41
+
sha256 = "0v9vpxcp9ybwnfljskqn41vjq7c0srdfv7qs890a6480pnk4kavd";
42
};
43
44
nativeBuildInputs = [ cmake ];
···
50
"-DHAS_TERRA_VERSION=0"
51
"-DTERRA_VERSION=${version}"
52
"-DTERRA_LUA=luajit"
53
+
"-DTERRA_SKIP_LUA_DOWNLOAD=ON"
54
"-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}"
55
] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON";
56
···
61
patches = [ ./nix-cflags.patch ];
62
63
postPatch = ''
64
substituteInPlace src/terralib.lua \
65
--subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include
66
'';