hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

meson/nix: Fix meson.build nix patch (#3594)

Browse source 
`meson.build` was modified in #3547 but `nix/patches/meson-build.patch`
was not updated to reflect the changes.
This commit is contained in:
outfoxxed 2023-10-17 04:05:38 -07:00 committed by GitHub
parent 421f5fb221
commit 210be10c92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nix/patches/meson-build.patch
View file

@ -1,10 +1,10 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 726933bc..28b4d9ac 100644 index 1d2c7f9f..c5ef4e67 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -29,20 +29,7 @@ add_project_arguments( @@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
], add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
language: 'cpp') endif
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2']) -wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
-have_xwlr = wlroots.get_variable('features').get('xwayland') -have_xwlr = wlroots.get_variable('features').get('xwayland')
@ -24,7 +24,7 @@ index 726933bc..28b4d9ac 100644
add_project_arguments('-DNO_XWAYLAND', language: 'cpp') add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
endif endif
@@ -71,8 +58,6 @@ foreach file : headers @@ -75,8 +62,6 @@ foreach file : headers
install_headers(file, subdir: 'hyprland', preserve_path: true) install_headers(file, subdir: 'hyprland', preserve_path: true)
endforeach endforeach
@ -34,7 +34,7 @@ index 726933bc..28b4d9ac 100644
subdir('src') subdir('src')
subdir('hyprctl') subdir('hyprctl')
diff --git a/src/meson.build b/src/meson.build diff --git a/src/meson.build b/src/meson.build
index 2065c6f5..55530605 100644 index 0af864b9..38723b8c 100644
--- a/src/meson.build --- a/src/meson.build
+++ b/src/meson.build +++ b/src/meson.build
@@ -9,16 +9,16 @@ executable('Hyprland', src, @@ -9,16 +9,16 @@ executable('Hyprland', src,