From b9e923ea351145bf4f904e132fcfdbeed45dbe0f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 21 Aug 2023 09:25:06 -0500
Subject: [PATCH] waybar: remove waybar-hyprland

---
 pkgs/applications/misc/waybar/default.nix   | 11 +++--------
 pkgs/applications/misc/waybar/hyprland.diff | 12 ------------
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  4 ----
 4 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/applications/misc/waybar/hyprland.diff

diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index e91ddb55ee51..6b087c26b97b 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -44,7 +44,7 @@
 
 , cavaSupport ? true
 , evdevSupport ? true
-, hyprlandSupport ? false
+, hyprlandSupport ? true
 , inputSupport ? true
 , jackSupport ? true
 , mpdSupport ? true
@@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  # Patch for workspaces support in wlr/workspaces
-  # See https://wiki.hyprland.org/Useful-Utilities/Status-Bars/#waybar
-  patches = lib.optional hyprlandSupport [ ./hyprland.diff ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -120,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wlroots
   ]
-  ++ lib.optionals cavaSupport  [
+  ++ lib.optionals cavaSupport [
     SDL2
     alsa-lib
     fftw
@@ -166,8 +162,7 @@ stdenv.mkDerivation (finalAttrs: {
     "tests" = runTests;
     "upower_glib" = upowerSupport;
     "wireplumber" = wireplumberSupport;
-  })
-  ++ lib.optional hyprlandSupport (lib.mesonBool "experimental" true);
+  });
 
   preFixup = lib.optionalString withMediaPlayer ''
     cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py
diff --git a/pkgs/applications/misc/waybar/hyprland.diff b/pkgs/applications/misc/waybar/hyprland.diff
deleted file mode 100644
index d3febdae4a1f..000000000000
--- a/pkgs/applications/misc/waybar/hyprland.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/modules/wlr/workspace_manager.cpp
-+++ b/src/modules/wlr/workspace_manager.cpp
-@@ -523,7 +523,8 @@
-   if (action.empty())
-     return true;
-   else if (action == "activate") {
--    zext_workspace_handle_v1_activate(workspace_handle_);
-+    const std::string command = "hyprctl dispatch workspace " + name_;
-+    system(command.c_str());
-   } else if (action == "close") {
-     zext_workspace_handle_v1_remove(workspace_handle_);
-   } else {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d3ea778c3afb..2fa19974f1ee 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1823,6 +1823,7 @@ mapAliases ({
   ### W ###
 
   wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21
+  waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21
   way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13
   wayfireApplications-unwrapped = throw ''
     'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a44aa772da6..51315795c270 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32665,10 +32665,6 @@ with pkgs;
 
   waybar = callPackage ../applications/misc/waybar { };
 
-  waybar-hyprland = callPackage ../applications/misc/waybar {
-    hyprlandSupport = true;
-  };
-
   waycorner = callPackage ../applications/misc/waycorner { };
 
   waylock = callPackage ../applications/misc/waylock { };