Unverified Commit e4eb5b5f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #293741 from eclairevoyant/wslu 

wslu: install desktop item; move to by-name
parents 473d080e 70330b7e

pkgs/by-name/ws/wslu/fix-desktop-item.patch

0 → 100644
+39 −0
Original line number Diff line number Diff line 
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

pkgs/tools/system/wslu/default.nix→pkgs/by-name/ws/wslu/package.nix

+7 −1
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, copyDesktopItems

}:



stdenv.mkDerivation rec {
@@ -9,13 +10,16 @@ stdenv.mkDerivation rec { 


  src = fetchFromGitHub {

    owner = "wslutilities";

    repo = pname;

    repo = "wslu";

    rev = "v${version}";

    hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc=";

  };



  nativeBuildInputs = [ copyDesktopItems ];



  patches = [

    ./fallback-conf-nix-store.diff

    ./fix-desktop-item.patch

  ];



  postPatch = ''
@@ -28,6 +32,8 @@ stdenv.mkDerivation rec { 
    "PREFIX="

  ];



  desktopItems = [ "src/etc/wslview.desktop" ];



  meta = with lib; {

    description = "A collection of utilities for Windows Subsystem for Linux";

    homepage = "https://github.com/wslutilities/wslu";

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -14845,8 +14845,6 @@ with pkgs; 














  woeusb-ng = callPackage ../tools/misc/woeusb-ng { };



























  wslu = callPackage ../tools/system/wslu { };



























  chase = callPackage ../tools/system/chase { };





























  wimlib = callPackage ../tools/archivers/wimlib { };