From 2e0341a12e41fee9526101ed5859ef25e3499bc7 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 12 May 2025 16:35:42 -0500 Subject: [PATCH] build --- ExampleApps.nix | 4 ++-- ExampleModules.nix | 30 +++++++++++++++--------------- flake.nix | 4 ---- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/ExampleApps.nix b/ExampleApps.nix index 801e6b2..32c04df 100644 --- a/ExampleApps.nix +++ b/ExampleApps.nix @@ -54,7 +54,7 @@ buildPhase = '' clang++ \ src/example_apps/ImguiEmbed/*.cpp \ - modules/examples/TestImgui/*.cpp \ + modules/Archimedes-Modules/TestImgui/*.cpp \ modules/WindowModule/*.cpp \ modules/ImguiModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ @@ -96,7 +96,7 @@ buildPhase = '' clang++ \ src/example_apps/TerminalEmbed/*.cpp \ - modules/Terminal/*.cpp \ + modules/Archimedes-Modules/Terminal/*.cpp \ modules/WindowModule/*.cpp \ modules/ImguiModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ diff --git a/ExampleModules.nix b/ExampleModules.nix index d078c37..e30fe58 100644 --- a/ExampleModules.nix +++ b/ExampleModules.nix @@ -12,7 +12,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/TestMenu/*.cpp \ + modules/Archimedes-Modules/TestMenu/*.cpp \ -fpic -shared \ -Wall \ -DTESTMENU_DYNAMIC \ @@ -42,7 +42,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/TestNotCurses/*.cpp \ + modules/Archimedes-Modules/TestNotCurses/*.cpp \ -fpic -shared \ -I include \ -Wall \ @@ -70,7 +70,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/Print/*.cpp \ + modules/Archimedes-Modules/Print/*.cpp \ -fpic -shared \ -I include \ -Wall \ @@ -97,7 +97,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/DependsOnPrint/*.cpp \ + modules/Archimedes-Modules/DependsOnPrint/*.cpp \ -fpic -shared \ -I include \ -Wall \ @@ -124,8 +124,8 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/DependsOnPrintStatic/*.cpp \ - ${inputs.Archimedes-Modules}/Print/*.cpp \ + modules/Archimedes-Modules/DependsOnPrintStatic/*.cpp \ + modules/Archimedes-Modules/Print/*.cpp \ -fpic -shared \ -I include -I . \ -DDEPENDSONPRINTSTATIC_DYNAMIC \ @@ -159,7 +159,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/TestImgui/*.cpp \ + modules/Archimedes-Modules/TestImgui/*.cpp \ modules/WindowModule/*.cpp \ modules/ImguiModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ @@ -202,7 +202,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/Calculator/*.cpp \ + modules/Archimedes-Modules/Calculator/*.cpp \ modules/WindowModule/*.cpp \ modules/ImguiModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ @@ -240,7 +240,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/TestClay/*.cpp \ + modules/Archimedes-Modules/TestClay/*.cpp \ -fpic -shared \ -I include \ -DRENDERER=1 \ @@ -273,7 +273,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/Chat/ChatServer/*.cpp \ + modules/Archimedes-Modules/Chat/ChatServer/*.cpp \ modules/ServerModule/*.cpp \ -fpic -shared \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ @@ -307,7 +307,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/ChatVoice/ChatServerVoice/*.cpp \ + modules/Archimedes-Modules/ChatVoice/ChatServerVoice/*.cpp \ modules/ServerModule/*.cpp \ -fpic -shared \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ @@ -345,7 +345,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/Chat/ChatClient/*.cpp \ + modules/Archimedes-Modules/Chat/ChatClient/*.cpp \ modules/ClientModule/*.cpp \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ @@ -392,7 +392,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/ChatVoice/ChatClientVoice/*.cpp \ + modules/Archimedes-Modules/ChatVoice/ChatClientVoice/*.cpp \ modules/ClientModule/*.cpp \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ @@ -438,7 +438,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/Terminal/*.cpp \ + modules/Archimedes-Modules/Terminal/*.cpp \ modules/ImguiModule/*.cpp \ modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ @@ -484,7 +484,7 @@ buildPhase = '' clang++ \ - ${inputs.Archimedes-Modules}/Ollama/*.cpp \ + modules/Archimedes-Modules/Ollama/*.cpp \ modules/ImguiModule/*.cpp \ modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ diff --git a/flake.nix b/flake.nix index 2a5488f..0a14db2 100755 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,6 @@ url = "github:nicbarker/clay"; flake = false; }; - Archimedes-Modules = { - url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Archimedes-Modules"; - flake = false; - }; }; outputs = { self, nixpkgs, imgui, clay, ... }@inputs: let