diff --git a/flake.lock b/flake.lock
index 191175dd6..4141dd206 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     },
     "nixpkgs-next-unpatched": {
       "locked": {
-        "lastModified": 1709186479,
-        "narHash": "sha256-QkbBumCaOuv4wn1t6DArgTD1alKJT+p2akmeAwrN+YM=",
+        "lastModified": 1709229663,
+        "narHash": "sha256-xg7Yq3QMxfjWyFsp5DMOHVTW9ZiAHNisJrh2zP6FrFw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0852bff4370133e3a62b0cc7d14d193b928a7c59",
+        "rev": "e894afb6c101fea0771b47d7827bef022e89ee1e",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1709187136,
-        "narHash": "sha256-MmxlX3yTFZEtNJ4LBvpMTfLroZoCJwTzjarVqeqD04I=",
+        "lastModified": 1709229748,
+        "narHash": "sha256-d9OgkZsz5hnuwlQjJIJA8ie5rlBXTAKjN3yIuyfzGBU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f21aa90cb8c078969543956d88c19696b646743",
+        "rev": "d29fabd630000579f744d04639d625828ba412bf",
         "type": "github"
       },
       "original": {
diff --git a/hosts/common/programs/sway/default.nix b/hosts/common/programs/sway/default.nix
index eec926e0c..72fdbd1d4 100644
--- a/hosts/common/programs/sway/default.nix
+++ b/hosts/common/programs/sway/default.nix
@@ -32,7 +32,7 @@ let
     pkgs.sway-unwrapped.override {
       # wlroots seems to launch Xwayland itself, and i can't easily just do that myself externally.
       # so in order for the Xwayland it launches to be sandboxed, i need to patch the sandboxed version in here.
-      wlroots_0_16 = pkgs.wlroots_0_16.override {
+      wlroots = pkgs.wlroots.override {
         xwayland = config.sane.programs.xwayland.package;
       };
 
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 7d588fbb0..eb391523d 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -31,11 +31,6 @@ in [
   #   merged.master = "<date>";
   # etc, where "date" is like "20240228181608"
   # and can be found with `nix-repl  > :lf .  > lastModifiedDate`
-  (fetchpatch' {
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/291806";
-    title = "swaynotificationcenter: support cross compilation";
-    hash = "sha256-Od5591zj8OW2WncI4eY9i5i8cFsAM7NQtHyYB9KSpLg=";
-  })
   (fetchpatch' {
     prUrl = "https://github.com/NixOS/nixpkgs/pull/288518";
     saneCommit = "20c9492d303be7cbad560e3d83bc47ab4b1e93f7";
@@ -50,11 +45,6 @@ in [
     hash = "sha256-jUtMmT4d+/6hZgrpXhfBcToAfdecl7xtEj1d/ofxaIM=";
     merged.staging = "20240228181608";
   })
-  (fetchpatch' {
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/291947";
-    title = "libshumate: support cross compilation";
-    hash = "sha256-l1EXoggqgcmAlKdq501x2hBjqaGJrG4hO/xSnSWDt3U=";
-  })
 
   # (fetchpatch' {
   #   title = "nixos/slskd: allow omitting username from yaml config";
diff --git a/overlays/cross.nix b/overlays/cross.nix
index a7c7edc96..90c0cce0e 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -2062,6 +2062,14 @@ in with final; {
     '';
   });
 
+  # 2024/02/29: upstreaming is unblocked
+  wlroots = prev.wlroots.overrideAttrs (upstream: {
+    nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
+      # incorrectly specified as `buildInputs` in nixpkgs.
+      hwdata
+    ];
+  });
+
   # wrapFirefox = prev.wrapFirefox.override {
   #   buildPackages = buildPackages // {
   #     # fixes "extract-binary-wrapper-cmd: line 2: strings: command not found"
diff --git a/overlays/preferences.nix b/overlays/preferences.nix
index 9fd6b4241..9082e30dc 100644
--- a/overlays/preferences.nix
+++ b/overlays/preferences.nix
@@ -69,7 +69,7 @@
   # ];
 
   sway-unwrapped = super.sway-unwrapped.override {
-    wlroots_0_16 = wlroots_0_16.overrideAttrs (upstream: {
+    wlroots = wlroots.overrideAttrs (upstream: {
       # 2023/09/08: fix so clicking a notification can activate the corresponding window.
       # - test: run dino, receive a message while tabbed away, click the desktop notification.
       #   - if sway activates the dino window (i.e. colors the workspace and tab), then all good
@@ -93,7 +93,7 @@
       #     - i.e. my experience with dino is the same using mako as with SwayNC
       postPatch = (upstream.postPatch or "") + ''
         substituteInPlace types/wlr_xdg_activation_v1.c \
-          --replace 'if (token->seat != NULL)' 'if (false && token->seat != NULL)'
+          --replace-fail 'if (token->seat != NULL)' 'if (false && token->seat != NULL)'
       '';
     });
   };