From 4036c37e5578d9d8558bacbf590becc09c7d51b2 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 15 Dec 2025 17:59:08 +0200 Subject: [PATCH] hyprctl: add nix flag (#12653) --- CMakeLists.txt | 4 ++++ nix/default.nix | 1 + src/debug/HyprCtl.cpp | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a192a6942..d3af715d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,6 +321,10 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) endif() endif() +if(BUILT_WITH_NIX) + add_compile_definitions(BUILT_WITH_NIX) +endif() + check_include_file("execinfo.h" EXECINFOH) if(EXECINFOH) message(STATUS "Configuration supports execinfo") diff --git a/nix/default.nix b/nix/default.nix index 27ecdf604..dc9c0bb13 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -192,6 +192,7 @@ in dontStrip = debug; cmakeFlags = mapAttrsToList cmakeBool { + "BUILT_WITH_NIX" = true; "NO_XWAYLAND" = !enableXWayland; "LEGACY_RENDERER" = legacyRenderer; "NO_SYSTEMD" = !withSystemd; diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index ad7f592c5..5e21d6992 100644 --- a/src/debug/HyprCtl.cpp +++ b/src/debug/HyprCtl.cpp @@ -1067,7 +1067,7 @@ std::string versionRequest(eHyprCtlOutputFormat format, std::string request) { result += __hyprland_api_get_hash(); result += "\n"; -#if (!ISDEBUG && !defined(NO_XWAYLAND)) +#if (!ISDEBUG && !defined(NO_XWAYLAND) && !defined(BUILT_WITH_NIX)) result += "no flags were set\n"; #else result += "flags set:\n"; @@ -1077,6 +1077,9 @@ std::string versionRequest(eHyprCtlOutputFormat format, std::string request) { #ifdef NO_XWAYLAND result += "no xwayland\n"; #endif +#ifdef BUILT_WITH_NIX + result += "nix\n"; +#endif #endif return result; } else { @@ -1113,6 +1116,9 @@ std::string versionRequest(eHyprCtlOutputFormat format, std::string request) { #ifdef NO_XWAYLAND result += "\"no xwayland\","; #endif +#ifdef BUILT_WITH_NIX + result += "\"nix\","; +#endif trimTrailingComma(result);