From 259cc9a3fabcfbe54a813095359adf3932d5e45f Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 12 Apr 2025 13:31:36 -0500 Subject: [PATCH] build --- flake.nix | 43 +++++++++++++++++++++++++++++++++ modules/Terminal/src/Terminal.h | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 77623b0..0ac8fed 100755 --- a/flake.nix +++ b/flake.nix @@ -145,6 +145,49 @@ }; + Terminal = pkgs.stdenvNoCC.mkDerivation { + + name = "Terminal"; + + src = ./.; + + inherit imgui; + + nativeBuildInputs = with pkgs; [ + clang + ]; + + buildInputs = with pkgs; [ + glfw + glew + ]; + + buildPhase = '' + clang++ \ + modules/Terminal/src/*.cpp \ + modules/ImguiModule/src/*.cpp \ + modules/WindowModule/src/*.cpp \ + $imgui/backends/imgui_impl_glfw.cpp \ + $imgui/backends/imgui_impl_opengl3.cpp \ + $imgui/misc/cpp/*.cpp \ + $imgui/*.cpp \ + -DRENDERER_OPENGL \ + -DWINDOW_GLFW \ + -DTERMINAL_DYNAMIC \ + -fpic -shared \ + -I src -I include -I $imgui -I . \ + -lGL -lglfw -lGLEW \ + -Wall \ + -o $name + ''; + + installPhase = '' + mkdir -p $out/bin + cp $name $out/bin + ''; + + }; + Ollama = pkgs.stdenvNoCC.mkDerivation { name = "Ollama"; diff --git a/modules/Terminal/src/Terminal.h b/modules/Terminal/src/Terminal.h index a520cd8..d7180df 100644 --- a/modules/Terminal/src/Terminal.h +++ b/modules/Terminal/src/Terminal.h @@ -14,7 +14,7 @@ class Terminal : public Archimedes::Module { int master; }; -#ifdef MAINGUI_DYNAMIC +#ifdef TERMINAL_DYNAMIC #define MODULE_TYPE Terminal #include "endModule.h" #endif