diff options
| author | Mihai Fufezan <[email protected]> | 2023-03-15 20:29:25 +0200 |
|---|---|---|
| committer | Mihai Fufezan <[email protected]> | 2023-03-15 20:29:25 +0200 |
| commit | 595f2052c4ddd08e8e467ea355e574459555a0a0 (patch) | |
| tree | bfbe290e2b35b1d06310458430dc9d14bb43529c | |
| parent | f5669a7d6bdb54d21426f6aa31a66fe813fc4e7d (diff) | |
| download | Hyprland-595f2052c4ddd08e8e467ea355e574459555a0a0.tar.gz Hyprland-595f2052c4ddd08e8e467ea355e574459555a0a0.zip | |
Nix: fix meson patch
| -rw-r--r-- | nix/meson-build.patch | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/nix/meson-build.patch b/nix/meson-build.patch index 0b9e0d93..f0aac23f 100644 --- a/nix/meson-build.patch +++ b/nix/meson-build.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index f380255..abd7cd3 100644 +index f3802553..a6538d84 100644 --- a/meson.build +++ b/meson.build @@ -21,9 +21,9 @@ else @@ -14,7 +14,7 @@ index f380255..abd7cd3 100644 add_project_arguments( [ -@@ -39,23 +39,8 @@ add_project_arguments( +@@ -39,21 +39,11 @@ add_project_arguments( ], language: 'cpp') @@ -29,17 +29,28 @@ index f380255..abd7cd3 100644 -if get_option('xwayland').enabled() and not have_xwlr - error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support') -endif --have_xwayland = xcb_dep.found() and have_xwlr + have_xwayland = xcb_dep.found() and have_xwlr - --if not have_xwayland + if not have_xwayland -add_project_arguments('-DNO_XWAYLAND', language: 'cpp') --endif -- ++ add_project_arguments('-DNO_XWAYLAND', language: 'cpp') + endif + backtrace_dep = cpp_compiler.find_library('execinfo', required: false) - systemd_dep = dependency('libsystemd', required: get_option('systemd')) +@@ -61,9 +51,9 @@ systemd_dep = dependency('libsystemd', required: get_option('systemd')) + + if get_option('systemd').enabled() + if systemd_dep.found() +- add_project_arguments('-DUSES_SYSTEMD', language: 'cpp') ++ add_project_arguments('-DUSES_SYSTEMD', language: 'cpp') + else +- error('Cannot enable systemd in Hyprland: libsystemd was not found') ++ error('Cannot enable systemd in Hyprland: libsystemd was not found') + endif + endif diff --git a/src/meson.build b/src/meson.build -index 7b658d3..da8baa5 100644 +index 7b658d31..da8baa56 100644 --- a/src/meson.build +++ b/src/meson.build @@ -7,7 +7,7 @@ executable('Hyprland', src, |