public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terra: include libc headers by default, run tests 

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2019-09-19 00:26:48 -05:00
parent 52d3655c3d
commit d5e1d57cee
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/compilers/terra/default.nix
View File

@ -9,7 +9,6 @@ let
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "terra"; pname = "terra";
version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}"; version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}";
@ -21,15 +20,21 @@ stdenv.mkDerivation rec {
sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s"; sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s";
}; };
hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ lua ];
buildInputs = with llvmPackages; [ llvm clang-unwrapped ncurses ];
doCheck = true;
enableParallelBuilding = true;
hardeningDisable = [ "fortify" ];
outputs = [ "bin" "dev" "out" "static" ]; outputs = [ "bin" "dev" "out" "static" ];
patches = [ ./nix-cflags.patch ]; patches = [ ./nix-cflags.patch ];
postPatch = '' postPatch = ''
substituteInPlace Makefile --replace \ substituteInPlace Makefile \
'-lcurses' '-lncurses' --replace '-lcurses' '-lncurses'
substituteInPlace src/terralib.lua \
--subst-var-by NIX_LIBC_INCLUDE ${stdenv.cc.libc.dev}/include
''; '';
preBuild = '' preBuild = ''
@ -42,6 +47,8 @@ stdenv.mkDerivation rec {
cp ${luajitSrc} build/${luajitArchive} cp ${luajitSrc} build/${luajitArchive}
''; '';
checkPhase = "(cd tests && ../terra run)";
installPhase = '' installPhase = ''
install -Dm755 -t $bin/bin release/bin/terra install -Dm755 -t $bin/bin release/bin/terra
install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary} install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary}
@ -51,8 +58,6 @@ stdenv.mkDerivation rec {
cp -rv release/include/terra $dev/include cp -rv release/include/terra $dev/include
''; '';
buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A low-level counterpart to Lua"; description = "A low-level counterpart to Lua";
homepage = http://terralang.org/; homepage = http://terralang.org/;

7
pkgs/development/compilers/terra/nix-cflags.patch
View File

@ -1,13 +1,16 @@
diff --git a/src/terralib.lua b/src/terralib.lua diff --git a/src/terralib.lua b/src/terralib.lua
index 351238d..f26591b 100644 index 351238d..e638c90 100644
--- a/src/terralib.lua --- a/src/terralib.lua
+++ b/src/terralib.lua +++ b/src/terralib.lua
@@ -3395,6 +3395,14 @@ function terra.includecstring(code,cargs,target) @@ -3395,6 +3395,17 @@ function terra.includecstring(code,cargs,target)
args:insert("-internal-isystem") args:insert("-internal-isystem")
args:insert(path) args:insert(path)
end end
+ +
+ -- NOTE(aseipp): include relevant Nix header files + -- NOTE(aseipp): include relevant Nix header files
+ args:insert("-isystem")
+ args:insert("@NIX_LIBC_INCLUDE@")
+
+ local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE') + local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')
+ if nix_cflags ~= nil then + if nix_cflags ~= nil then
+ for w in nix_cflags:gmatch("%S+") do + for w in nix_cflags:gmatch("%S+") do