From 8e2c77bcf173138657fb7fc9c7de9dbc032a1d4a Mon Sep 17 00:00:00 2001 From: Anish Bhobe Date: Tue, 13 May 2025 15:58:42 +0200 Subject: [PATCH] Clean-up `flake.nix`. --- build.sh | 31 ---------------------- flake.nix | 3 +-- run.sh | 14 ---------- vendored-nix/eastl/default.nix | 4 +-- vendored-nix/scottt-debugbreak/default.nix | 14 ++-------- vendored-nix/tinygltf/default.nix | 4 +-- 6 files changed, 7 insertions(+), 63 deletions(-) delete mode 100755 build.sh delete mode 100755 run.sh diff --git a/build.sh b/build.sh deleted file mode 100755 index 1655f44..0000000 --- a/build.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -echo "Running CMake" -if grep 'NAME=NixOS' /etc/os-release -then - cmake --preset nixos -else - cmake --preset linux -fi - -echo "Running Ninja" -if echo "$@" | grep -e "clean" -q -then - cmake --build build --target clean -elif echo "$@" | grep -e "rebuild" -q -then - cmake --build build --clean-first -else - cmake --build build -fi - -if echo "$@" | grep -e "docs" -q -then - if echo "$@" | grep -e "-v" -q - then - doxygen - else - doxygen > /dev/null || echo "Doxygen Failed" - fi -fi - diff --git a/flake.nix b/flake.nix index 3ed29fc..c539f34 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ with pkgs; { devShells.default = clangStdenv.mkDerivation { - name = "BlazeEnv"; + name = "Aster-Env"; nativeBuildInputs = [ @@ -30,7 +30,6 @@ ]; buildInputs = [ - sdl3 glm glfw3 eastl diff --git a/run.sh b/run.sh deleted file mode 100755 index da66291..0000000 --- a/run.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -if [ -d "build" ]; then - pushd ./build/samples/04_scenes/ > /dev/null || exit - if echo "$@" | grep -e "debug" -q - then - lldb ./scene_render - else - ./scene_render - fi - popd > /dev/null || exit -else - echo "Build Aster first." -fi diff --git a/vendored-nix/eastl/default.nix b/vendored-nix/eastl/default.nix index 5b8d59f..ef5d989 100644 --- a/vendored-nix/eastl/default.nix +++ b/vendored-nix/eastl/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, ninja, eabase }: let buildFolder = "out/"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "eastl"; version = "3.21.23"; src = fetchFromGitHub { owner = "electronicarts"; repo = "EASTL"; - rev = "3.21.23"; + rev = version; sha256 = "sha256-8imixecWN/FOHY/9IxkIMbkxK7NXZ0TecZ4/SvOqf14="; }; diff --git a/vendored-nix/scottt-debugbreak/default.nix b/vendored-nix/scottt-debugbreak/default.nix index 37f85ba..b23d741 100644 --- a/vendored-nix/scottt-debugbreak/default.nix +++ b/vendored-nix/scottt-debugbreak/default.nix @@ -1,26 +1,16 @@ { stdenv, fetchFromGitHub}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "scottt-debugbreak"; version = "1.0"; src = fetchFromGitHub { owner = "scottt"; repo = "debugbreak"; - rev = "v1.0"; + rev = "v${version}"; sha256 = "sha256-lFMBSbA4mwAgW/+T+G1pfrwYjcZFuoKr6t8JYMB65Yw="; fetchSubmodules = false; }; - configurePhase = '' - runHook preConfigure - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - runHook postBuild - ''; - installPhase = '' runHook preInstall mkdir -p $out/include diff --git a/vendored-nix/tinygltf/default.nix b/vendored-nix/tinygltf/default.nix index 59542da..8f73836 100644 --- a/vendored-nix/tinygltf/default.nix +++ b/vendored-nix/tinygltf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tinygltf"; version = "2.9.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; - rev = "v2.9.5"; + rev = "v${version}"; sha256 = "sha256-7GsLdjOAZvi/Lqu7mTWwvQTa5WokbGQlHy/CPoHipD8="; fetchSubmodules = false; };