From b10211c4c2f266b1a779dae1de95a97257654dda Mon Sep 17 00:00:00 2001 From: Krutonium Date: Sun, 10 May 2026 13:25:43 -0400 Subject: [PATCH 1/3] Add Desktop Icon --- flake.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/flake.nix b/flake.nix index c8e38a849b..706f8f24ad 100644 --- a/flake.nix +++ b/flake.nix @@ -71,6 +71,16 @@ mkdir -p $out/bin cp dusk $out/bin/dusk cp -r ./res $out/bin/res + + # Install .desktop file + mkdir -p $out/share/applications + cp $src/platforms/freedesktop/dusk.desktop $out/share/applications/dusk.desktop + + + for size in 16 32 48 64 128 256 512 1024; do + install -Dm644 $src/platforms/freedesktop/''${size}x''${size}/apps/dusk.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/dusk.png + done ''; nativeBuildInputs = [ pkgs.cmake From d6cbc9b6d519d667f441d5b23713baae3856a262 Mon Sep 17 00:00:00 2001 From: Krutonium Date: Sun, 10 May 2026 14:09:50 -0400 Subject: [PATCH 2/3] Set Version String to be NixOS- OR dirty --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index 706f8f24ad..398fc07b4d 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,9 @@ cp -r ${aurora-src}/. $sourceRoot/extern/aurora/ chmod -R u+w $sourceRoot/extern/aurora sed -i '/add_subdirectory(tests)/d' $sourceRoot/extern/aurora/CMakeLists.txt + # Allow Setting VERSION + sed -i 's/find_package(Git)/# find_package(Git)/' $sourceRoot/CMakeLists.txt + sed -i 's/set(DUSK_WC_DESCRIBE "UNKNOWN-VERSION")/# set(DUSK_WC_DESCRIBE "UNKNOWN-VERSION")/' $sourceRoot/CMakeLists.txt ''; # Remove last line to re-enable tests cmakeFlags = [ @@ -66,6 +69,8 @@ "-DFETCHCONTENT_SOURCE_DIR_IMGUI=${imgui-src}" "-DFETCHCONTENT_SOURCE_DIR_RMLUI=${rmlui-src}" "-DCMAKE_CROSSCOMPILING=ON" # Tests are not working as I didn't want to work through getting google's test suite working as well. This is the only guard I could find to disable it. + "-DDUSK_WC_DESCRIBE=NixOS-${builtins.substring 0 7 (self.rev or "dirty")}" + "-DDUSK_VERSION_STRING=NixOS-${builtins.substring 0 7 (self.rev or "dirty")}" ]; installPhase = '' mkdir -p $out/bin @@ -106,6 +111,7 @@ pkgs.tracy pkgs.freetype pkgs.zstd + pkgs.libdecor ]; }; in { From e93773757fb9839e65489026c9c4e8dc46c189f3 Mon Sep 17 00:00:00 2001 From: Krutonium Date: Tue, 12 May 2026 23:35:54 -0400 Subject: [PATCH 3/3] Edit CMakeLists to add Nix Version --- CMakeLists.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aaf08be2ef..359b892bab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,19 @@ if (NOT CMAKE_BUILD_TYPE) "Build type options: Debug Release RelWithDebInfo MinSizeRel" FORCE) endif () -# obtain revision info from git -find_package(Git) +set(DUSK_VERSION_OVERRIDE "" CACHE STRING "Override version string (skips git detection and format validation)") + +if (DUSK_VERSION_OVERRIDE) + set(DUSK_WC_DESCRIBE "${DUSK_VERSION_OVERRIDE}") + set(DUSK_VERSION_STRING "0.0.0.0") + set(DUSK_SHORT_VERSION_STRING "0.0.0") + set(DUSK_WC_REVISION "") + set(DUSK_WC_BRANCH "") + set(DUSK_WC_DATE "") + message(STATUS "Dusklight version overridden to ${DUSK_WC_DESCRIBE}") +else () + # obtain revision info from git + find_package(Git) if (GIT_FOUND) # make sure version information gets re-run when the current Git HEAD changes execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --git-path HEAD @@ -63,6 +74,8 @@ else () set(DUSK_SHORT_VERSION_STRING "0.0.0") endif () +endif () + # Add version information to CI environment variables if(DEFINED ENV{GITHUB_ENV}) file(APPEND "$ENV{GITHUB_ENV}" "DUSK_VERSION=${DUSK_WC_DESCRIBE}\n")