summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Ni <oliver.ni@gmail.com>2023-03-27 00:10:42 -0400
committerMihai Fufezan <fufexan@pm.me>2023-03-27 11:00:37 +0300
commite994b0c8b881de5145e583720abbd9ff27d727ac (patch)
tree09bac5b03982b0686665d512e857a5aec8c5bbe5
parent3343aac6bf6aa601cb882859edf63a6cb59bb774 (diff)
Fix nix build options
-rw-r--r--meson.build8
-rw-r--r--meson_options.txt1
-rw-r--r--nix/default.nix5
3 files changed, 10 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index d9d06561..ce371ec3 100644
--- a/meson.build
+++ b/meson.build
@@ -59,14 +59,18 @@ endif
backtrace_dep = cpp_compiler.find_library('execinfo', required: false)
systemd_dep = dependency('libsystemd', required: get_option('systemd'))
-if get_option('systemd').enabled()
+if get_option('systemd').enabled()
if systemd_dep.found()
add_project_arguments('-DUSES_SYSTEMD', language: 'cpp')
- else
+ else
error('Cannot enable systemd in Hyprland: libsystemd was not found')
endif
endif
+if get_option('legacy_renderer').enabled()
+ add_project_arguments('-DLEGACY_RENDERER', language: 'cpp')
+endif
+
if get_option('buildtype') == 'debug'
add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
endif
diff --git a/meson_options.txt b/meson_options.txt
index e8e2b062..16a34a54 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,3 @@
option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
option('systemd', type: 'feature', value: 'auto', description: 'Enable systemd integration')
+option('legacy_renderer', type: 'feature', value: 'disabled', description: 'Enable legacy renderer')
diff --git a/nix/default.nix b/nix/default.nix
index a240f803..9924dbb3 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -89,8 +89,9 @@ in
else "release";
mesonFlags = builtins.concatLists [
- (lib.optional (!enableXWayland) "-Dxwayland=disabled")
- (lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true")
+ ["-Dauto_features=disabled"]
+ (lib.optional enableXWayland "-Dxwayland=enabled")
+ (lib.optional legacyRenderer "-Dlegacy_renderer=enabled")
(lib.optional withSystemd "-Dsystemd=enabled")
];