From 80e07092788dd2231d33d77b7ef178ba0fc65500 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 12 May 2025 15:23:44 -0500 Subject: [PATCH] build --- ExampleModules.nix | 28 ++++++++++++++-------------- flake.lock | 35 ++++++++++++++++++++++++++--------- flake.nix | 6 +++++- 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/ExampleModules.nix b/ExampleModules.nix index 8f86319..d5a6813 100644 --- a/ExampleModules.nix +++ b/ExampleModules.nix @@ -12,7 +12,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestMenu/*.cpp \ + ${inputs.Archimedes-Modules}/TestMenu/*.cpp \ -fpic -shared \ -Wall \ -DTESTMENU_DYNAMIC \ @@ -42,7 +42,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestNotCurses/*.cpp \ + ${inputs.Archimedes-Modules}/TestNotCurses/*.cpp \ -fpic -shared \ -I include \ -Wall \ @@ -70,7 +70,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/Print/*.cpp \ + ${inputs.Archimedes-Modules}/Print/*.cpp \ -fpic -shared \ -I include \ -Wall \ @@ -97,7 +97,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/DependsOnPrint/*.cpp \ + ${inputs.Archimedes-Modules}/DependsOnPrint/*.cpp \ -fpic -shared \ -I include \ -Wall \ @@ -124,8 +124,8 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/DependsOnPrintStatic/*.cpp \ - modules/Archimedes-Modules/Print/*.cpp \ + ${inputs.Archimedes-Modules}/DependsOnPrintStatic/*.cpp \ + ${inputs.Archimedes-Modules}/Print/*.cpp \ -fpic -shared \ -I include -I . \ -DDEPENDSONPRINTSTATIC_DYNAMIC \ @@ -159,7 +159,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestImgui/*.cpp \ + ${inputs.Archimedes-Modules}/TestImgui/*.cpp \ modules/WindowModule/*.cpp \ modules/ImguiModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ @@ -197,7 +197,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/TestClay/*.cpp \ + ${inputs.Archimedes-Modules}/TestClay/*.cpp \ -fpic -shared \ -I include \ -DRENDERER=1 \ @@ -230,7 +230,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/Chat/ChatServer/*.cpp \ + ${inputs.Archimedes-Modules}/Chat/ChatServer/*.cpp \ modules/ServerModule/*.cpp \ -fpic -shared \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ @@ -264,7 +264,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/ChatVoice/ChatServerVoice/*.cpp \ + ${inputs.Archimedes-Modules}/ChatVoice/ChatServerVoice/*.cpp \ modules/ServerModule/*.cpp \ -fpic -shared \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ @@ -302,7 +302,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/Chat/ChatClient/*.cpp \ + ${inputs.Archimedes-Modules}/Chat/ChatClient/*.cpp \ modules/ClientModule/*.cpp \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ @@ -349,7 +349,7 @@ buildPhase = '' clang++ \ - modules/Archimedes-Modules/ChatVoice/ChatClientVoice/*.cpp \ + ${inputs.Archimedes-Modules}/ChatVoice/ChatClientVoice/*.cpp \ modules/ClientModule/*.cpp \ -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \ -lGameNetworkingSockets \ @@ -395,7 +395,7 @@ buildPhase = '' clang++ \ - modules/Terminal/*.cpp \ + ${inputs.Archimedes-Modules}/Terminal/*.cpp \ modules/ImguiModule/*.cpp \ modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ @@ -441,7 +441,7 @@ buildPhase = '' clang++ \ - modules/Ollama/*.cpp \ + ${inputs.Archimedes-Modules}/Ollama/*.cpp \ modules/ImguiModule/*.cpp \ modules/WindowModule/*.cpp \ $imgui/backends/imgui_impl_glfw.cpp \ diff --git a/flake.lock b/flake.lock index eb4564b..61c39cf 100755 --- a/flake.lock +++ b/flake.lock @@ -1,13 +1,29 @@ { "nodes": { + "Archimedes-Modules": { + "flake": false, + "locked": { + "lastModified": 1747079936, + "narHash": "sha256-+lpnX9reLMTq6WDl4Covcn0jVVE3BX8syiIpo+Kpy/c=", + "ref": "refs/heads/master", + "rev": "550f20602f514c4396878ca25cc62a9ffead00e8", + "revCount": 8, + "type": "git", + "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Archimedes-Modules" + }, + "original": { + "type": "git", + "url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Archimedes-Modules" + } + }, "clay": { "flake": false, "locked": { - "lastModified": 1742509368, - "narHash": "sha256-XSaMuWCADZgZnRaGcBgf+u40O6jS5kkpq3Xruy6z+I0=", + "lastModified": 1746753934, + "narHash": "sha256-7Kx536YsmPTXUjs/jBknGAmqYsqqDh6T11AlarTeGLM=", "owner": "nicbarker", "repo": "clay", - "rev": "ad49977f1b37ccd7664333181f30f575d08d3838", + "rev": "76265e4c3c97ebe5a4aab081d5c5a05e5a979d5d", "type": "github" }, "original": { @@ -19,11 +35,11 @@ "imgui": { "flake": false, "locked": { - "lastModified": 1741968903, - "narHash": "sha256-4L37NRR+dlkhdxuDjhLR45kgjyZK2uelKBlGZ1nQzgY=", + "lastModified": 1747034542, + "narHash": "sha256-kVbyG7LXXHIOiI6dlZVID9DLErR+XNoAGp/R82TEpgo=", "owner": "ocornut", "repo": "imgui", - "rev": "126d004f9e1eef062bf4b044b3b2faaf58d48c51", + "rev": "e33069ce56d07751ca875eb239f41febef0ebcd3", "type": "github" }, "original": { @@ -35,11 +51,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -51,6 +67,7 @@ }, "root": { "inputs": { + "Archimedes-Modules": "Archimedes-Modules", "clay": "clay", "imgui": "imgui", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index b0c92d3..2a5488f 100755 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,13 @@ 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 + outputs = { self, nixpkgs, imgui, clay, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; in {