hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-12-20 02:30:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

hyprctl: add nix flag (#12653)

Browse source
This commit is contained in:
Mihai Fufezan 2025-12-15 17:59:08 +02:00 • committed by GitHub
parent 7ccc57eb7c
commit 4036c37e55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -321,6 +321,10 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
endif() endif()
endif() endif()
if(BUILT_WITH_NIX)
add_compile_definitions(BUILT_WITH_NIX)
endif()
check_include_file("execinfo.h" EXECINFOH) check_include_file("execinfo.h" EXECINFOH)
if(EXECINFOH) if(EXECINFOH)
message(STATUS "Configuration supports execinfo") message(STATUS "Configuration supports execinfo")

1
nix/default.nix
View file

@ -192,6 +192,7 @@ in
dontStrip = debug; dontStrip = debug;
cmakeFlags = mapAttrsToList cmakeBool { cmakeFlags = mapAttrsToList cmakeBool {
"BUILT_WITH_NIX" = true;
"NO_XWAYLAND" = !enableXWayland; "NO_XWAYLAND" = !enableXWayland;
"LEGACY_RENDERER" = legacyRenderer; "LEGACY_RENDERER" = legacyRenderer;
"NO_SYSTEMD" = !withSystemd; "NO_SYSTEMD" = !withSystemd;

8
src/debug/HyprCtl.cpp
View file

@ -1067,7 +1067,7 @@ std::string versionRequest(eHyprCtlOutputFormat format, std::string request) {
result += __hyprland_api_get_hash(); result += __hyprland_api_get_hash();
result += "\n"; result += "\n";
#if (!ISDEBUG && !defined(NO_XWAYLAND)) #if (!ISDEBUG && !defined(NO_XWAYLAND) && !defined(BUILT_WITH_NIX))
result += "no flags were set\n"; result += "no flags were set\n";
#else #else
result += "flags set:\n"; result += "flags set:\n";
@ -1077,6 +1077,9 @@ std::string versionRequest(eHyprCtlOutputFormat format, std::string request) {
#ifdef NO_XWAYLAND #ifdef NO_XWAYLAND
result += "no xwayland\n"; result += "no xwayland\n";
#endif #endif
#ifdef BUILT_WITH_NIX
result += "nix\n";
#endif
#endif #endif
return result; return result;
} else { } else {
@ -1113,6 +1116,9 @@ std::string versionRequest(eHyprCtlOutputFormat format, std::string request) {
#ifdef NO_XWAYLAND #ifdef NO_XWAYLAND
result += "\"no xwayland\","; result += "\"no xwayland\",";
#endif #endif
#ifdef BUILT_WITH_NIX
result += "\"nix\",";
#endif
trimTrailingComma(result); trimTrailingComma(result);