wslu: 4.1.3 -> 4.1.4 (#373755)

This commit is contained in:
Sandro
2025-01-14 16:28:23 +01:00
committed by GitHub
2 changed files with 4 additions and 44 deletions
@@ -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
+4 -5
View File
@@ -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";