diff options
| author | outfoxxed <[email protected]> | 2023-10-17 04:05:38 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-17 12:05:38 +0100 |
| commit | 210be10c92275c73fb37512f7abfde1eece9026b (patch) | |
| tree | 9ed8395583420b1494a142ef07f5f4c96f5d546b /nix | |
| parent | 421f5fb221322c028092dcf3a943f26a30d45b9f (diff) | |
| download | Hyprland-210be10c92275c73fb37512f7abfde1eece9026b.tar.gz Hyprland-210be10c92275c73fb37512f7abfde1eece9026b.zip | |
meson/nix: Fix meson.build nix patch (#3594)
`meson.build` was modified in #3547 but `nix/patches/meson-build.patch`
was not updated to reflect the changes.
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/patches/meson-build.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nix/patches/meson-build.patch b/nix/patches/meson-build.patch index 23442172..b8f784e9 100644 --- a/nix/patches/meson-build.patch +++ b/nix/patches/meson-build.patch @@ -1,10 +1,10 @@ diff --git a/meson.build b/meson.build -index 726933bc..28b4d9ac 100644 +index 1d2c7f9f..c5ef4e67 100644 --- a/meson.build +++ b/meson.build -@@ -29,20 +29,7 @@ add_project_arguments( - ], - language: 'cpp') +@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h') + add_project_arguments('-DHAS_EXECINFO', language: 'cpp') + endif -wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2']) -have_xwlr = wlroots.get_variable('features').get('xwayland') @@ -24,7 +24,7 @@ index 726933bc..28b4d9ac 100644 add_project_arguments('-DNO_XWAYLAND', language: 'cpp') endif -@@ -71,8 +58,6 @@ foreach file : headers +@@ -75,8 +62,6 @@ foreach file : headers install_headers(file, subdir: 'hyprland', preserve_path: true) endforeach @@ -34,7 +34,7 @@ index 726933bc..28b4d9ac 100644 subdir('src') subdir('hyprctl') diff --git a/src/meson.build b/src/meson.build -index 2065c6f5..55530605 100644 +index 0af864b9..38723b8c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -9,16 +9,16 @@ executable('Hyprland', src, |