From 31d8eab939a79323870e0ed999bd2a52f77674e9 Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Wed, 27 Nov 2024 21:56:00 -0500
Subject: [PATCH] universedesktop: Update DWL

---
 machines/universedesktop/desktop/dwl.nix | 25 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/machines/universedesktop/desktop/dwl.nix b/machines/universedesktop/desktop/dwl.nix
index c46679e..3bd5801 100644
--- a/machines/universedesktop/desktop/dwl.nix
+++ b/machines/universedesktop/desktop/dwl.nix
@@ -10,11 +10,20 @@ in {
 
   nixpkgs.overlays = [
     (final: prev: {
-      dwl = prev.dwl.overrideAttrs (old: let
+      wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
+        src = final.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "wlroots";
+          repo = "wlroots";
+          rev = "47fb00f66d5a8367d0108bd960f99e51ab1a1318"; # 0.19-prev
+          hash = "sha256-HkpTML14tbYBLiHkqoFRSn/qKsVny/oso2TuG6LY/fk=";
+        };
+      });
+      dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let
         dwl-patches = pkgs.fetchgit {
           url = "https://codeberg.org/dwl/dwl-patches.git";
-          rev = "7f93815e9c9d50add8493e680b3057ed0cc6e8a0";
-          hash = "sha256-LK1+WjAlguBvITPyS4oHXW5bNP19WUEfo87GFmyv8Js=";
+          rev = "8b1f9fbdb2c3394bc26a9ff0ac872f64c38e29f7";
+          hash = "sha256-fW7cJC2uT9uV0fdB/5rjHOWnQHouvjJrcem1hENm6R0=";
         };
         patches = let
           dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
@@ -25,18 +34,18 @@ in {
           (dwl-patch "autostart")
         ];
       in {
-        version = "10-05-2024";
+        version = "21-09-2024";
         
         src = final.fetchFromGitea {
           domain = "codeberg.org";
           owner = "dwl";
           repo = "dwl";
-          rev = "9825c26cdd5dfed34022b77a8936c5d8f485e134";
-          hash = "sha256-p7BhCbCduMNTEK5DYNGBYXf+9WU6WlRvR9VdOuSTrVU=";
+          rev = "002c7d22043da56a54511b5d234c2e3bd997d119";
+          hash = "sha256-mgO+iTJmAM0N5Q+6fAfMAOU0O1T8xUWRdaIcbRX3Pa8=";
         };
-        
+ 
         patches = (old.patches or []) ++ patches;
-        postPatch = ''
+        postPatch = (old.postPatch or "") + ''
           export termcmd=${pkgs.foot}/bin/foot
           export editcmd=${launch_emacs}
           export menucmd=${pkgs.fuzzel}/bin/fuzzel