Fix nix build options

This commit is contained in:
Oliver Ni 2023-03-27 00:10:42 -04:00 committed by Mihai Fufezan
parent 3343aac6bf
commit e994b0c8b8
3 changed files with 10 additions and 4 deletions

View file

@ -59,14 +59,18 @@ endif
backtrace_dep = cpp_compiler.find_library('execinfo', required: false) backtrace_dep = cpp_compiler.find_library('execinfo', required: false)
systemd_dep = dependency('libsystemd', required: get_option('systemd')) systemd_dep = dependency('libsystemd', required: get_option('systemd'))
if get_option('systemd').enabled() if get_option('systemd').enabled()
if systemd_dep.found() if systemd_dep.found()
add_project_arguments('-DUSES_SYSTEMD', language: 'cpp') add_project_arguments('-DUSES_SYSTEMD', language: 'cpp')
else else
error('Cannot enable systemd in Hyprland: libsystemd was not found') error('Cannot enable systemd in Hyprland: libsystemd was not found')
endif endif
endif endif
if get_option('legacy_renderer').enabled()
add_project_arguments('-DLEGACY_RENDERER', language: 'cpp')
endif
if get_option('buildtype') == 'debug' if get_option('buildtype') == 'debug'
add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp') add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
endif endif

View file

@ -1,2 +1,3 @@
option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
option('systemd', type: 'feature', value: 'auto', description: 'Enable systemd integration') option('systemd', type: 'feature', value: 'auto', description: 'Enable systemd integration')
option('legacy_renderer', type: 'feature', value: 'disabled', description: 'Enable legacy renderer')

View file

@ -89,8 +89,9 @@ in
else "release"; else "release";
mesonFlags = builtins.concatLists [ mesonFlags = builtins.concatLists [
(lib.optional (!enableXWayland) "-Dxwayland=disabled") ["-Dauto_features=disabled"]
(lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true") (lib.optional enableXWayland "-Dxwayland=enabled")
(lib.optional legacyRenderer "-Dlegacy_renderer=enabled")
(lib.optional withSystemd "-Dsystemd=enabled") (lib.optional withSystemd "-Dsystemd=enabled")
]; ];