cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

start: use nixGL if Hyprland is nix but not NixOS (#12845)

Browse source 
---------

Co-authored-by: Mihai Fufezan <mihai@fufexan.net>
This commit is contained in:
Vaxry 2026-01-08 10:57:56 +01:00 • committed by GitHub
parent 918e2bb9be
commit 8368566044
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 147 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
start/src/main.cpp
View file

@ -3,6 +3,7 @@
#include <print>
#include "helpers/Logger.hpp"
#include "helpers/Nix.hpp"
#include "core/State.hpp"
#include "core/Instance.hpp"
@ -16,7 +17,12 @@ using namespace Hyprutils::CLI;
}
constexpr const char* HELP_INFO = R"#(start-hyprland - A binary to properly start Hyprland via a watchdog process.
Any arguments after -- are passed to Hyprland. For Hyprland help, run start-hyprland -- --help or Hyprland --help)#";
Any arguments after -- are passed to Hyprland. For Hyprland help, run start-hyprland -- --help or Hyprland --help
Additional arguments for start-hyprland:
--path [path] -> Override Hyprland path
--no-nixgl -> Force disable nixGL
)#";
//
static void onSignal(int sig) {
@ -69,6 +75,10 @@ int main(int argc, const char** argv, const char** envp) {
g_state->customPath = argv[++i];
continue;
}
if (arg == "--no-nixgl") {
g_state->noNixGl = true;
continue;
}
}
if (startArgv != -1)
@ -77,6 +87,15 @@ int main(int argc, const char** argv, const char** envp) {
if (!g_state->rawArgvNoBinPath.empty())
g_logger->log(Hyprutils::CLI::LOG_WARN, "Arguments after -- are passed to Hyprland");
// check if our environment is OK
if (const auto RET = Nix::nixEnvironmentOk(); !RET) {
g_logger->log(Hyprutils::CLI::LOG_ERR, "Nix environment check failed:\n{}", RET.error());
return 1;
}
if (Nix::shouldUseNixGL())
g_logger->log(Hyprutils::CLI::LOG_DEBUG, "Hyprland was compiled with Nix - will use nixGL");
bool safeMode = false;
while (true) {
g_instance = makeUnique<CHyprlandInstance>();