From 576b47b2ad5d1f189a523f99fb922776adc843ba Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 1 Mar 2025 18:25:35 +0100
Subject: [PATCH 1/2] icewm: fetch patch to fix start menu entries without
 icons

https://github.com/NixOS/nixpkgs/issues/385959
https://github.com/bbidulock/icewm/issues/794

Why is this patch fetched from the `bbidulock` repo and
not from the `ice-wm` repo which contains the release commit?
According to https://github.com/ice-wm/icewm/wiki ,
the `ice-wm` repo is only used for releases;
development happens in `bbidulock`.
Due to this, the commit that is to be fetched hasn't
reached `ice-wm` yet (at the time of this writing).
---
 pkgs/by-name/ic/icewm/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index 88331aea41357..cb92d3e828610 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -37,6 +37,7 @@
   pcre2,
   perl,
   pkg-config,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -94,6 +95,17 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
   ];
 
+  patches = [
+    # https://github.com/NixOS/nixpkgs/issues/385959
+    # https://github.com/bbidulock/icewm/issues/794
+    # TODO: remove this patch when it is included in a release
+    (fetchpatch {
+      name = "fdomenu-icons-quoted";
+      url = "https://github.com/bbidulock/icewm/commit/74bb0a2989127a3ff87d2932ff547713bc710cfe.patch";
+      hash = "sha256-/rMSJYGAJs9cgNu5j4Mov/PfO7ocXQeNRq0vasfRcKA=";
+    })
+  ];
+
   cmakeFlags = [
     "-DPREFIX=$out"
     "-DCFGDIR=/etc/icewm"

From 8824a59b7f54f6aa326f0f409a4086333abd3972 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 1 Mar 2025 18:29:08 +0100
Subject: [PATCH 2/2] icewm: 3.7.0 -> 3.7.1

Release notes: https://github.com/ice-wm/icewm/releases/tag/3.7.1
Changes: https://github.com/ice-wm/icewm/compare/3.7.0...3.7.1
---
 pkgs/by-name/ic/icewm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index cb92d3e828610..397fb528ddd37 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -42,13 +42,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "icewm";
-  version = "3.7.0";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "ice-wm";
     repo = "icewm";
     rev = finalAttrs.version;
-    hash = "sha256-RUT/zJcoDiNMit7XlxVb2lctta7NxcGAiFe3Mj7jUyM=";
+    hash = "sha256-4JF2ZAp8dx2fpSYRUz4I8US3oIZrSS90oljuxQDm38A=";
   };
 
   strictDeps = true;