diff --git a/flake.lock b/flake.lock
index d2f6e13b..b120de39 100644
--- a/flake.lock
+++ b/flake.lock
@@ -167,11 +167,11 @@
     },
     "nixpkgs-next-unpatched": {
       "locked": {
-        "lastModified": 1710244872,
-        "narHash": "sha256-1iqB4gqob4bI04qdX5bvJ/sJT7fK7IH64SagdVoHCjk=",
+        "lastModified": 1710337169,
+        "narHash": "sha256-u2/74bhQuWykUZDWUIhHd6IpZiaQ0hSpTBbx0y9opkE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2e2cc05898bbe54a8004801ea300525b231d24e2",
+        "rev": "4ee0840ba2ecc50458ab1677d108afcd691f4815",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1710247538,
-        "narHash": "sha256-Mm3aCwfAdYgG2zKf5SLRBktPH0swXN1yEetAMn05KAA=",
+        "lastModified": 1710339354,
+        "narHash": "sha256-+P5ccUPiLouHexb8aJrUOVOIja9qm+fG57pgAu7uIRs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "21adc4f16a8ab151fec83b9d9368cd62d9de86bc",
+        "rev": "2dbc8f62d8af7a1ab962e4b20d12b25ddcb86ced",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710241979,
-        "narHash": "sha256-y3FqKdTRgToiUb3Um4WoLJnA81D8KeDTu63MxSWHqhM=",
+        "lastModified": 1710317949,
+        "narHash": "sha256-bwReMiWPA2wYBvKEMhO8pJcu+o+7ocy5hGkSoawTHu0=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "0f9388d3a9daa597ad87b870de236fb45e24ba63",
+        "rev": "771cb198c281db6918829651f194bf4db32e342d",
         "type": "github"
       },
       "original": {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 2fa29fd8..fc7736fa 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -52,7 +52,7 @@ in [
   (fetchpatch' {
     prUrl = "https://github.com/NixOS/nixpkgs/pull/292415";
     title = "sway/hyprland: cross compilation fixes";
-    hash = "sha256-MgqeTufPek0cUELXjHWoSfDU5Pl9wtwnjWBlnqabHu8=";
+    hash = "sha256-3BGZK5Plx1IJzKHv19RwcRWQ4S+cbUbsPbEzpxFEYsI=";
   })
 
   # (fetchpatch' {
diff --git a/overlays/cross.nix b/overlays/cross.nix
index ba910ca0..d3308ea1 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -985,6 +985,10 @@ in with final; {
   #   '';
   # });
 
+  # hyprland = prev.hyprland.overrideAttrs (_: {
+  #   depsBuildBuild = [ pkg-config ];
+  # });
+
   # 2024/02/27: upstreaming is blocked on gconf
   # "setup: line 1595: ant: command not found"
   # i2p = mvToNativeInputs [ ant gettext ] prev.i2p;
@@ -2022,6 +2026,12 @@ in with final; {
   #     "-Dman-pages=disabled"
   #   ];
   # });
+  # waybar = (prev.waybar.override { runTests = false; }).overrideAttrs (upstream: {
+  #   nativeBuildInputs = upstream.nativeBuildInputs ++ [
+  #     wayland-scanner
+  #   ];
+  #   strictDeps = true;
+  # });
 
   webkitgtk = prev.webkitgtk.overrideAttrs (upstream: {
     # fixes "wayland-scanner: line 5: syntax error: unterminated quoted string"
@@ -2063,12 +2073,12 @@ in with final; {
 
   # 2024/02/29: upstreaming is blocked on libei (unless Xwayland config option is disabled in nixpkgs)
   #             out for PR: <https://github.com/NixOS/nixpkgs/pull/292415>
-  # wlroots = prev.wlroots.overrideAttrs (upstream: {
-  #   nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
-  #     # incorrectly specified as `buildInputs` in nixpkgs.
-  #     hwdata
-  #   ];
-  # });
+  wlroots = prev.wlroots.overrideAttrs (upstream: {
+    nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
+      # incorrectly specified as `buildInputs` in nixpkgs.
+      hwdata
+    ];
+  });
 
   # wrapFirefox = prev.wrapFirefox.override {
   #   buildPackages = buildPackages // {