16dae4d8f853b0d3e8434ee9941f9fc0155b8952

Message

Updated hash checking

This is needed since hyprwm/Hyprland#12110 got merged

Diff

This diff is truncated to protect this page.

  1diff --git a/flake.lock b/flake.lock
  2index cb91f915ed3fb9bc74bdadb3d8eb81b909f1c6c3..b301a2ce7b13667209a142a1572e4e3ea134716e 100644
  3--- a/flake.lock
  4+++ b/flake.lock
  5@@ -20,11 +20,11 @@
  6         ]
  7       },
  8       "locked": {
  9-        "lastModified": 1755946532,
 10-        "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=",
 11+        "lastModified": 1760101617,
 12+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
 13         "owner": "hyprwm",
 14         "repo": "aquamarine",
 15-        "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada",
 16+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
 17         "type": "github"
 18       },
 19       "original": {
 20@@ -116,11 +116,11 @@
 21         ]
 22       },
 23       "locked": {
 24-        "lastModified": 1756891319,
 25-        "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=",
 26+        "lastModified": 1760445448,
 27+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
 28         "owner": "hyprwm",
 29         "repo": "hyprgraphics",
 30-        "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d",
 31+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
 32         "type": "github"
 33       },
 34       "original": {
 35@@ -145,17 +145,17 @@
 36         "xdph": "xdph"
 37       },
 38       "locked": {
 39-        "lastModified": 1757508065,
 40-        "narHash": "sha256-JkUkn8p/sHqjmykejd9ZMUlYyaXA+Ve9IPA71ybqloY=",
 41+        "lastModified": 1761869718,
 42+        "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=",
 43         "owner": "hyprwm",
 44         "repo": "hyprland",
 45-        "rev": "46174f78b374b6cea669c48880877a8bdcf7802f",
 46+        "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
 47         "type": "github"
 48       },
 49       "original": {
 50         "owner": "hyprwm",
 51         "repo": "hyprland",
 52-        "rev": "46174f78b374b6cea669c48880877a8bdcf7802f",
 53+        "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
 54         "type": "github"
 55       }
 56     },
 57@@ -171,11 +171,11 @@
 58         ]
 59       },
 60       "locked": {
 61-        "lastModified": 1749046714,
 62-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
 63+        "lastModified": 1759610243,
 64+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
 65         "owner": "hyprwm",
 66         "repo": "hyprland-protocols",
 67-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
 68+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
 69         "type": "github"
 70       },
 71       "original": {
 72@@ -239,11 +239,11 @@
 73         ]
 74       },
 75       "locked": {
 76-        "lastModified": 1753819801,
 77-        "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
 78+        "lastModified": 1759080228,
 79+        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
 80         "owner": "hyprwm",
 81         "repo": "hyprland-qtutils",
 82-        "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
 83+        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
 84         "type": "github"
 85       },
 86       "original": {
 87@@ -268,11 +268,11 @@
 88         ]
 89       },
 90       "locked": {
 91-        "lastModified": 1756810301,
 92-        "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=",
 93+        "lastModified": 1758927902,
 94+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
 95         "owner": "hyprwm",
 96         "repo": "hyprlang",
 97-        "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931",
 98+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
 99         "type": "github"
100       },
101       "original": {
102@@ -293,11 +293,11 @@
103         ]
104       },
105diff --git a/flake.nix b/flake.nix
106index b0e4a098ec8f40c27cae8c9f67ad67d6c017769d..b38c0e105e00ee20da069bb51ccefe3511f423c0 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111   inputs = {
112-    hyprland.url = "github:hyprwm/hyprland/46174f78b374b6cea669c48880877a8bdcf7802f";
113+    hyprland.url = "github:hyprwm/hyprland/8e9add2afda58d233a75e4c5ce8503b24fa59ceb";
114   };
115 
116   outputs = { self, hyprland, ... }: let
117diff --git a/src/main.cpp b/src/main.cpp
118index aa8d427b5dd509e49315c7b9785647f06d96f431..f7f1f752fa2f62d58f5b3b4a07b7af8deb15eb59 100644
119--- a/src/main.cpp
120+++ b/src/main.cpp
121@@ -14,7 +14,10 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
122 	PHANDLE = handle;
123 
124 #ifndef HY3_NO_VERSION_CHECK
125-	if (GIT_COMMIT_HASH != std::string(__hyprland_api_get_hash())) {
126+	const std::string COMPOSITOR_HASH = __hyprland_api_get_hash();
127+	const std::string CLIENT_HASH = __hyprland_api_get_client_hash();
128+
129+	if (COMPOSITOR_HASH != CLIENT_HASH) {
130 		HyprlandAPI::addNotification(
131 		    PHANDLE,
132 		    "[hy3] hy3 was compiled for a different version of hyprland; refusing to load.",