waybar: remove waybar-hyprland
This commit is contained in:
parent
7b864dc3ea
commit
b9e923ea35
|
@ -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
|
||||
|
|
|
@ -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 {
|
|
@ -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'
|
||||
|
|
|
@ -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 { };
|
||||
|
|
Loading…
Reference in New Issue
Block a user