From 03b0b73fbd0a369e55426cbeee6951f9c73eb0b2 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 26 Feb 2025 22:24:17 +0100
Subject: [PATCH] miriway: 24.11.1 -> 25.02

---
 nixos/modules/programs/miriway.nix  | 10 +++++++++-
 pkgs/by-name/mi/miriway/package.nix |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/miriway.nix b/nixos/modules/programs/miriway.nix
index ab7bccad18ea..b9a6288c4c2a 100644
--- a/nixos/modules/programs/miriway.nix
+++ b/nixos/modules/programs/miriway.nix
@@ -65,7 +65,10 @@ in
 
   config = lib.mkIf cfg.enable {
     environment = {
-      systemPackages = [ pkgs.miriway ];
+      systemPackages = with pkgs; [
+        miriway
+        vanilla-dmz
+      ];
       etc = {
         "xdg/xdg-miriway/miriway-shell.config".text = cfg.config;
       };
@@ -80,6 +83,11 @@ in
     services.displayManager.sessionPackages = [ pkgs.miriway ];
 
     xdg.icons.enable = true;
+    xdg.icons.fallbackCursorThemes = lib.mkDefault [
+      # Miriway looks for "default" theme, fails to start if not present
+      # Mir normally looks for DMZ-White theme if none specified, so make that present as the default
+      "DMZ-White"
+    ];
   };
 
   meta.maintainers = with lib.maintainers; [ OPNA2608 ];
diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix
index 6967ff46b6ce..a202d003810c 100644
--- a/pkgs/by-name/mi/miriway/package.nix
+++ b/pkgs/by-name/mi/miriway/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miriway";
-  version = "24.11.1";
+  version = "25.02";
 
   src = fetchFromGitHub {
     owner = "Miriway";
     repo = "Miriway";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DphzqU0jT2NE2dSDuQf6BQIjXTwJuPiOjfxk9N9YmaQ=";
+    hash = "sha256-F8zmIuV0IszMZpeOhKAbvrjyA4EQH7JWH10rv2maCzk=";
   };
 
   postPatch = ''