From 9ff2440c798d9b9cca20e6d474c83b8ca2a42bad Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 14 Jan 2025 14:25:38 +0000
Subject: [PATCH] wslu: 4.1.3 -> 4.1.4

This includes removing one of the patch files, half of which is
unnecessary as the upstream package now installs the .desktop file in
the correct place, and half of which is replaced with a
substituteInPlace call.

(cherry picked from commit 337c0bd8b49512c573d766829306e3bd283671ae)
---
 pkgs/by-name/ws/wslu/fix-desktop-item.patch | 39 ---------------------
 pkgs/by-name/ws/wslu/package.nix            |  9 +++--
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/by-name/ws/wslu/fix-desktop-item.patch

diff --git a/pkgs/by-name/ws/wslu/fix-desktop-item.patch b/pkgs/by-name/ws/wslu/fix-desktop-item.patch
deleted file mode 100644
index 5645cff98ae6e..0000000000000
--- a/pkgs/by-name/ws/wslu/fix-desktop-item.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f63028c5712a89cb310165cde9701538fa85ce46 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=A9clairevoyant?=
- <848000+eclairevoyant@users.noreply.github.com>
-Date: Wed, 6 Mar 2024 06:09:44 -0500
-Subject: [PATCH] fix desktop item
-
----
- Makefile                | 1 -
- src/etc/wslview.desktop | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2399009..e823882 100644
---- a/Makefile
-+++ b/Makefile
-@@ -59,7 +59,6 @@ res_install:
- 	install -Dm 644 src/etc/*.ps1 -t $(DESTDIR)$(PREFIX)/share/wslu
- 	install -Dm 644 src/etc/*.ico -t $(DESTDIR)$(PREFIX)/share/wslu
- 	install -Dm 755 src/etc/*.sh -t $(DESTDIR)$(PREFIX)/share/wslu
--	install -Dm 644 src/etc/*.desktop $(DESTDIR)$(PREFIX)/share/wslu
- 	install -Dm 644 src/etc/conf $(DESTDIR)$(PREFIX)/share/wslu
- 
- conf_install:
-diff --git a/src/etc/wslview.desktop b/src/etc/wslview.desktop
-index ebb84b6..235a365 100644
---- a/src/etc/wslview.desktop
-+++ b/src/etc/wslview.desktop
-@@ -2,7 +2,7 @@
- Name=WSLView
- Comment=Open files and addresses in Windows
- Icon=windows
--Exec=/usr/bin/wslview %U
-+Exec=wslview %U
- Terminal=false
- Type=Application
- Categories=Utility;
--- 
-2.43.1
-
diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix
index 52ea85c4c7b9f..43fb9cbbfafc8 100644
--- a/pkgs/by-name/ws/wslu/package.nix
+++ b/pkgs/by-name/ws/wslu/package.nix
@@ -7,25 +7,26 @@
 
 stdenv.mkDerivation rec {
   pname = "wslu";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "wslutilities";
     repo = "wslu";
     rev = "v${version}";
-    hash = "sha256-lyJk8nOADq+s7GkZXsd1T4ilrDzMRsoALOesG8NxYK8=";
+    hash = "sha256-ssiwYkQg2rOirC/ZZVq2bJm4Ggc364uRkoS2y365Eb0=";
   };
 
   nativeBuildInputs = [ copyDesktopItems ];
 
   patches = [
     ./fallback-conf-nix-store.diff
-    ./fix-desktop-item.patch
   ];
 
   postPatch = ''
     substituteInPlace src/wslu-header \
       --subst-var out
+    substituteInPlace src/etc/wslview.desktop \
+      --replace-fail /usr/bin/wslview wslview
   '';
 
   makeFlags = [
@@ -33,8 +34,6 @@ stdenv.mkDerivation rec {
     "PREFIX="
   ];
 
-  desktopItems = [ "src/etc/wslview.desktop" ];
-
   meta = with lib; {
     description = "Collection of utilities for Windows Subsystem for Linux";
     homepage = "https://github.com/wslutilities/wslu";