nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch

diff --git a/src/terralib.lua b/src/terralib.lua
index 532ed18..2c265dc 100644
--- a/src/terralib.lua
+++ b/src/terralib.lua
@@ -3426,6 +3426,16 @@ function terra.includecstring(code,cargs,target)
     	args:insert("-internal-isystem")
     	args:insert(path)
     end
+    -- NOTE(aseipp): include relevant Nix header files
+    args:insert("-isystem")
+    args:insert("@NIX_LIBC_INCLUDE@")
+
+    local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')
+    if nix_cflags ~= nil then
+        for w in nix_cflags:gmatch("%S+") do
+          args:insert(w)
+        end
+    end
     -- Obey the SDKROOT variable on macOS to match Clang behavior.
     local sdkroot = os.getenv("SDKROOT")
     if sdkroot then
terra: patch to use NIX_CFLAGS_COMPILE for includes Terra heavily depends on its ability to interface with C APIs, but without scanning NIX_CFLAGS_COMPILE, it's awkward and annoying to set up imports correctly (by scanning and adding the flags yourself) in every single project. Luckily most of the Clang initialization is hidden away, but the Lua code for the Terra library handles all the high-level stuff, so we patch it in there. This allows simple examples like: C = terralib.includec("zlib.h") to work instantly, provided `zlib` is a Nix dependency. Signed-off-by: Austin Seipp <aseipp@pobox.com> 2019-09-19 02:44:55 +00:00			`diff --git a/src/terralib.lua b/src/terralib.lua`
terra: 1.0.0pre1175_ef6a75f -> 1.0.0-beta3 Contains the combined single-commit work by both @jnetod and myself from NixOS/nixpkgs#122665. Brings the build up to LLVM 10, switches to `symlinkJoin` for putting Clang where the CMake build expects it, and updates to a fresh update of Terra that works around a few LLVM bugs. 2021-05-16 06:02:00 +00:00			`index 532ed18..2c265dc 100644`
terra: patch to use NIX_CFLAGS_COMPILE for includes Terra heavily depends on its ability to interface with C APIs, but without scanning NIX_CFLAGS_COMPILE, it's awkward and annoying to set up imports correctly (by scanning and adding the flags yourself) in every single project. Luckily most of the Clang initialization is hidden away, but the Lua code for the Terra library handles all the high-level stuff, so we patch it in there. This allows simple examples like: C = terralib.includec("zlib.h") to work instantly, provided `zlib` is a Nix dependency. Signed-off-by: Austin Seipp <aseipp@pobox.com> 2019-09-19 02:44:55 +00:00			`--- a/src/terralib.lua`
			`+++ b/src/terralib.lua`
terra: 1.0.0pre1175_ef6a75f -> 1.0.0-beta3 Contains the combined single-commit work by both @jnetod and myself from NixOS/nixpkgs#122665. Brings the build up to LLVM 10, switches to `symlinkJoin` for putting Clang where the CMake build expects it, and updates to a fresh update of Terra that works around a few LLVM bugs. 2021-05-16 06:02:00 +00:00			`@@ -3426,6 +3426,16 @@ function terra.includecstring(code,cargs,target)`
terra: patch to use NIX_CFLAGS_COMPILE for includes Terra heavily depends on its ability to interface with C APIs, but without scanning NIX_CFLAGS_COMPILE, it's awkward and annoying to set up imports correctly (by scanning and adding the flags yourself) in every single project. Luckily most of the Clang initialization is hidden away, but the Lua code for the Terra library handles all the high-level stuff, so we patch it in there. This allows simple examples like: C = terralib.includec("zlib.h") to work instantly, provided `zlib` is a Nix dependency. Signed-off-by: Austin Seipp <aseipp@pobox.com> 2019-09-19 02:44:55 +00:00			`args:insert("-internal-isystem")`
			`args:insert(path)`
			`end`
			`+ -- NOTE(aseipp): include relevant Nix header files`
terra: include libc headers by default, run tests Signed-off-by: Austin Seipp <aseipp@pobox.com> 2019-09-19 05:26:48 +00:00			`+ args:insert("-isystem")`
			`+ args:insert("@NIX_LIBC_INCLUDE@")`
			`+`
terra: patch to use NIX_CFLAGS_COMPILE for includes Terra heavily depends on its ability to interface with C APIs, but without scanning NIX_CFLAGS_COMPILE, it's awkward and annoying to set up imports correctly (by scanning and adding the flags yourself) in every single project. Luckily most of the Clang initialization is hidden away, but the Lua code for the Terra library handles all the high-level stuff, so we patch it in there. This allows simple examples like: C = terralib.includec("zlib.h") to work instantly, provided `zlib` is a Nix dependency. Signed-off-by: Austin Seipp <aseipp@pobox.com> 2019-09-19 02:44:55 +00:00			`+ local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')`
			`+ if nix_cflags ~= nil then`
			`+ for w in nix_cflags:gmatch("%S+") do`
			`+ args:insert(w)`
			`+ end`
			`+ end`
terra: 1.0.0pre1175_ef6a75f -> 1.0.0-beta3 Contains the combined single-commit work by both @jnetod and myself from NixOS/nixpkgs#122665. Brings the build up to LLVM 10, switches to `symlinkJoin` for putting Clang where the CMake build expects it, and updates to a fresh update of Terra that works around a few LLVM bugs. 2021-05-16 06:02:00 +00:00			`-- Obey the SDKROOT variable on macOS to match Clang behavior.`
			`local sdkroot = os.getenv("SDKROOT")`
			`if sdkroot then`