terra: update to use LLVM's split derivations

A patch has been added to inject environment variables into the CMake
test runner, the `INCLUDE_PATH` variable has been specified, and the
merged LLVM derivation has been updated to refer to the split outputs.
This commit is contained in:
Sable Seyler 2021-06-05 16:48:45 -07:00
parent 6cf3ec0947
commit da04b1f00f
No known key found for this signature in database
GPG key ID: CC500589263FC3D8
2 changed files with 44 additions and 19 deletions

View file

@ -1,6 +1,5 @@
{ lib, stdenv, fetchurl, fetchFromGitHub
, llvmPackages, ncurses, cmake, libxml2, symlinkJoin
}:
{ lib, stdenv, fetchurl, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2
, symlinkJoin, breakpointHook }:
let
luajitRev = "9143e86498436892cb4316550be4d45b68a61224";
@ -9,27 +8,30 @@ let
url = "https://github.com/LuaJIT/LuaJIT/archive/${luajitRev}.tar.gz";
sha256 = "0kasmyk40ic4b9dwd4wixm0qk10l88ardrfimwmq36yc5dhnizmy";
};
in
stdenv.mkDerivation rec {
llvmMerged = symlinkJoin {
name = "llvmClangMerged";
paths = with llvmPackages; [
llvm.out
llvm.dev
llvm.lib
clang-unwrapped.out
clang-unwrapped.dev
clang-unwrapped.lib
];
};
in stdenv.mkDerivation rec {
pname = "terra";
version = "1.0.0-beta3";
src = fetchFromGitHub {
owner = "terralang";
repo = "terra";
rev = "release-${version}";
owner = "terralang";
repo = "terra";
rev = "release-${version}";
sha256 = "15ik32xnwyf3g57jvvaz24f6a18lv3a86341rzjbs30kd5045qzd";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
(symlinkJoin {
name = "llvmClangMerged";
paths = with llvmPackages; [ llvm clang-unwrapped ];
})
ncurses
libxml2
];
buildInputs = [ llvmMerged ncurses libxml2 ];
cmakeFlags = [
"-DHAS_TERRA_VERSION=0"
@ -47,10 +49,17 @@ stdenv.mkDerivation rec {
./get-compiler-from-envvar-fix-cpu-detection.patch
./nix-cflags.patch
./disable-luajit-file-download.patch
./nix-add-test-paths.patch
];
INCLUDE_PATH = "${llvmMerged}/lib/clang/10.0.1/include";
postPatch = ''
substituteInPlace src/terralib.lua \
--subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include
substituteInPlace src/CMakeLists.txt \
--subst-var INCLUDE_PATH
'';
preConfigure = ''
@ -69,9 +78,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A low-level counterpart to Lua";
homepage = "http://terralang.org/";
platforms = platforms.x86_64;
homepage = "http://terralang.org/";
platforms = platforms.x86_64;
maintainers = with maintainers; [ jb55 thoughtpolice ];
license = licenses.mit;
license = licenses.mit;
};
}

View file

@ -0,0 +1,16 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5de3e53..475659a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -386,6 +386,11 @@ foreach(TERRA_TEST ${TERRA_TESTS})
COMMAND $<TARGET_FILE:TerraExecutable> ${TERRA_TEST}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
)
+ set_tests_properties(
+ ${TERRA_TEST} PROPERTIES
+ ENVIRONMENT "LUA_PATH=./?.lua"
+ ENVIRONMENT "INCLUDE_PATH=@INCLUDE_PATH@"
+ )
endforeach()
foreach(TERRA_TEST ${TERRA_TESTS_INSTALL})
get_filename_component(TERRA_TEST_DIR ${TERRA_TEST} DIRECTORY)