Merge pull request #9 from horriblename/update

Update hyprland headers to v0.25

flake.nix

@@ -5,7 +5,7 @@
   description = "Hyprland plugin for touch gestures";
 
   inputs = {
-    hyprland.url = "github:horriblename/Hyprland/nix-pluginenv";
+    hyprland.url = "github:hyprwm/Hyprland";
     nixpkgs.follows = "hyprland/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };

meson.build

@@ -1,6 +1,7 @@
 project('hyprland-touch-gestures', 'cpp', 'c',
   version: '0.0.1',
-  default_options: [])
+  default_options: ['buildtype=release'],
+)
 
 cpp_compiler = meson.get_compiler('cpp')
 if cpp_compiler.has_argument('-std=c++23')

nix/default.nix

@@ -31,6 +31,10 @@ stdenv.mkDerivation {
 
   outputs = ["out"];
 
+  patches = [
+    ./meson-build.patch
+  ];
+
   nativeBuildInputs = [pkg-config ninja meson];
 
   buildInputs = [

nix/meson-build.patch

@@ -0,0 +1,12 @@
+diff --git a/src/meson.build b/src/meson.build
+index 7567d59..d675b7c 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -7,6 +7,7 @@ shared_module('touch-gestures',
+   link_with: [gestures],
+   dependencies: [
+     wftouch,
++    dependency('wlroots'),
+     dependency('pixman-1'),
+     dependency('libdrm'),
+     hyprland_headers

src/GestureManager.cpp

@@ -1,8 +1,8 @@
 #include "GestureManager.hpp"
-#include "src/Compositor.hpp"
-#include "src/debug/Log.hpp"
-#include "src/managers/KeybindManager.hpp"
-#include "src/managers/input/InputManager.hpp"
+#include <hyprland/src/Compositor.hpp>
+#include <hyprland/src/debug/Log.hpp>
+#include <hyprland/src/managers/KeybindManager.hpp>
+#include <hyprland/src/managers/input/InputManager.hpp>
 #include <algorithm>
 #include <cstdint>
 #include <memory>

src/GestureManager.hpp

@@ -1,9 +1,9 @@
 #pragma once
-#include "gestures/Gestures.hpp"
+#include "./gestures/Gestures.hpp"
 #include "globals.hpp"
-#include "src/debug/Log.hpp"
-#include "src/helpers/Monitor.hpp"
-#include <src/includes.hpp>
+#include <hyprland/src/debug/Log.hpp>
+#include <hyprland/src/helpers/Monitor.hpp>
+#include <hyprland/src/includes.hpp>
 #include <vector>
 #include <wayfire/touch/touch.hpp>
 

src/globals.hpp

@@ -1,5 +1,5 @@
 #pragma once
 
-#include <src/plugins/PluginAPI.hpp>
+#include <hyprland/src/plugins/PluginAPI.hpp>
 
 inline HANDLE PHANDLE = nullptr;

src/main.cpp

@@ -3,8 +3,8 @@
 
 #include "globals.hpp"
 
-#include <src/config/ConfigManager.hpp>
-#include <src/managers/input/InputManager.hpp>
+#include <hyprland/src/config/ConfigManager.hpp>
+#include <hyprland/src/managers/input/InputManager.hpp>
 // #include <wlr/types/wlr_touch.h>
 
 const CColor s_pluginColor = {0x61 / 255.0f, 0xAF / 255.0f, 0xEF / 255.0f,