From 9513882870e1768bf7562763deee94f684c00d85 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 27 Jan 2025 20:38:45 -0500 Subject: [PATCH] Still not working. --- .../flakes/starship-game/package.nix | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/nix/configuration/flakes/starship-game/package.nix b/nix/configuration/flakes/starship-game/package.nix index f2b57b3..dd6f91e 100644 --- a/nix/configuration/flakes/starship-game/package.nix +++ b/nix/configuration/flakes/starship-game/package.nix @@ -54,6 +54,20 @@ let hash = "sha256-dedZuV0BxU6goT+rPvrofYqTz9pTA/f6eQcsvpDWdvQ="; }; + yaml_cpp = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "f7320141120f720aecc4c32be25586e7da9eb978"; + hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI="; + }; + + # spdlog = fetchFromGitHub { + # owner = "gabime"; + # repo = "spdlog"; + # rev = "7e635fca68d014934b4af8a1cf874f63989352b7"; + # hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns="; + # }; + # stb_impl = writeTextFile { # name = "stb_impl.c"; # text = '' @@ -97,11 +111,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "starship-game"; - version = "1.0.0"; + version = "v1.0.0"; src = fetchFromGitHub { owner = "HarbourMasters"; repo = "starship"; + # rev = "5e5e49da93e066f51c3010ba38f09331d866f2db"; tag = finalAttrs.version; hash = "sha256-kaLLlLuonqE2DJcRlWR4tCEBNjwIYFlzeDLcYsvMO7I="; fetchSubmodules = true; @@ -163,6 +178,37 @@ stdenv.mkDerivation (finalAttrs: { # --replace-fail "\''${STB_DIR}" "/build/source/stb" # ''; + # (cd tools/Torch && cmake -H. -Bbuild-cmake -GNinja \ + # -DFETCHCONTENT_SOURCE_DIR_LIBGFXD=${libgfxd} \ + # -DFETCHCONTENT_SOURCE_DIR_YAML-CPP=${finalAttrs.yaml_cpp_src} \ + # -DFETCHCONTENT_SOURCE_DIR_SPDLOG=${finalAttrs.spdlog_src} + # ) + + configurePhase = '' + cmake -H. -Bbuild-cmake -GNinja \ + -DFETCHCONTENT_SOURCE_DIR_IMGUI=${imgui'.src} \ + -DFETCHCONTENT_SOURCE_DIR_STORMLIB=${stormlib'} \ + -DFETCHCONTENT_SOURCE_DIR_THREADPOOL=${thread_pool} + + (cd tools/Torch && cmake -H. -Bbuild-cmake -GNinja \ + -DFETCHCONTENT_SOURCE_DIR_LIBGFXD=${libgfxd} \ + -DFETCHCONTENT_SOURCE_DIR_YAML-CPP=${yaml_cpp} \ + -DFETCHCONTENT_SOURCE_DIR_SPDLOG=${spdlog} + ) + + (cd libultraship && cmake -H. -Bbuild-cmake -GNinja \ + -DFETCHCONTENT_SOURCE_DIR_LIBGFXD=${libgfxd} \ + -DFETCHCONTENT_SOURCE_DIR_IMGUI=${imgui'.src} \ + -DFETCHCONTENT_SOURCE_DIR_STORMLIB=${stormlib'} \ + -DFETCHCONTENT_SOURCE_DIR_THREADPOOL=${thread_pool} + ) + + ''; + + buildPhase = '' + cmake --build build-cmake + ''; + postBuild = '' cp ${gamecontrollerdb} ${gamecontrollerdb.name} pushd ../OTRExporter