From 4c51e1d6ca89a15e9498a3253f12a23046ac97f1 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Tue, 4 Oct 2022 20:13:47 +0700
Subject: [PATCH] overlays/eww: use nixpkgs' but keeping patch

---
 overlays/eww.nix           | 14 --------------
 overlays/patches/eww.patch | 27 ++++++++++++++-------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/overlays/eww.nix b/overlays/eww.nix
index 0e954ec..f244a51 100644
--- a/overlays/eww.nix
+++ b/overlays/eww.nix
@@ -1,20 +1,6 @@
 self: super: {
-  # For https://github.com/elkowar/eww/pull/280
   eww = super.eww.overrideAttrs (old: rec {
-    version = "unstable-fb0e57a";
-    src = self.fetchFromGitHub {
-      owner = "elkowar";
-      repo = "eww";
-      rev = "fb0e57a0149904e76fb33807a2804d4af82350de";
-      sha256 = "089rvcswr0wy05fac8xbfrws1qacqi3iialpv8sai7mzlpsw21m0";
-    };
     # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 )
     patches = old.patches ++ [ ./patches/eww.patch ];
-    cargoSha256 = "1s7rxilqis2nbvjqjp5zarvmr9g6ndcicyx1rilgjv34qwna3mz1";
-    cargoDeps = self.rustPlatform.fetchCargoTarball {
-      inherit src;
-      name = "${old.pname}-${version}";
-      sha256 = cargoSha256;
-    };
   });
 }
diff --git a/overlays/patches/eww.patch b/overlays/patches/eww.patch
index 8b61d41..22d1776 100644
--- a/overlays/patches/eww.patch
+++ b/overlays/patches/eww.patch
@@ -1,28 +1,29 @@
 diff --git a/crates/eww/src/widgets/widget_definitions.rs b/crates/eww/src/widgets/widget_definitions.rs
-index ec307537407..49c70571d4b 100644
+index 16f1f17d063..08d54cbe343 100644
 --- a/crates/eww/src/widgets/widget_definitions.rs
 +++ b/crates/eww/src/widgets/widget_definitions.rs
-@@ -6,7 +6,7 @@ use crate::{
- use anyhow::*;
+@@ -8,7 +8,7 @@ use crate::{
+ use anyhow::{anyhow, Context, Result};
  use codespan_reporting::diagnostic::Severity;
  use eww_shared_util::Spanned;
--use gdk::NotifyType;
-+use gdk::{NotifyType, ScrollDirection};
- use gtk::{self, glib, prelude::*};
- use itertools::Itertools;
- use once_cell::sync::Lazy;
-@@ -523,11 +523,14 @@ fn build_gtk_event_box(bargs: &mut BuilderArgs) -> Result<gtk::EventBox> {
+-use gdk::{ModifierType, NotifyType};
++use gdk::{ModifierType, NotifyType, ScrollDirection};
+ 
+ use glib::translate::FromGlib;
+ use gtk::{self, glib, prelude::*, DestDefaults, TargetEntry, TargetList};
+@@ -679,11 +679,14 @@ fn build_gtk_event_box(bargs: &mut BuilderArgs) -> Result<gtk::EventBox> {
          // @prop onscroll - event to execute when the user scrolls with the mouse over the widget. The placeholder `{}` used in the command will be replaced with either `up` or `down`.
          prop(timeout: as_duration = Duration::from_millis(200), onscroll: as_string) {
              gtk_widget.add_events(gdk::EventMask::SCROLL_MASK);
 -            gtk_widget.add_events(gdk::EventMask::SMOOTH_SCROLL_MASK);
-             connect_single_handler!(gtk_widget, gtk_widget.connect_scroll_event(move |_, evt| {
+-            connect_signal_handler!(gtk_widget, gtk_widget.connect_scroll_event(move |_, evt| {
 -                let delta = evt.delta().1;
 -                if delta != 0f64 { // Ignore the first event https://bugzilla.gnome.org/show_bug.cgi?id=675959
--                    run_command(timeout, &onscroll, if delta < 0f64 { "up" } else { "down" });
+-                    run_command(timeout, &onscroll, &[if delta < 0f64 { "up" } else { "down" }]);
++            connect_single_handler!(gtk_widget, gtk_widget.connect_scroll_event(move |_, evt| {
 +                let dir = match evt.direction() {
-+                    ScrollDirection::Up => "up",
-+                    ScrollDirection::Down => "down",
++                    ScrollDirection::Left => "up",
++                    ScrollDirection::Right => "down",
 +                    _ => "",
 +                };
 +                if dir != "" {