commit e4eb5b5fcc33d6a584bb3542b0dcb1c7abe21f79 · pyrox.dev/nixpkgs

+39

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

···

       1
       +
       From f63028c5712a89cb310165cde9701538fa85ce46 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: =?UTF-8?q?=C3=A9clairevoyant?=

     

       3
       +
        <848000+eclairevoyant@users.noreply.github.com>

     

       4
       +
       Date: Wed, 6 Mar 2024 06:09:44 -0500

     

       5
       +
       Subject: [PATCH] fix desktop item

     

       6
       +
       

     

       7
       +
       ---

     

       8
       +
        Makefile                | 1 -

     

       9
       +
        src/etc/wslview.desktop | 2 +-

     

       10
       +
        2 files changed, 1 insertion(+), 2 deletions(-)

     

       11
       +
       

     

       12
       +
       diff --git a/Makefile b/Makefile

     

       13
       +
       index 2399009..e823882 100644

     

       14
       +
       --- a/Makefile

     

       15
       +
       +++ b/Makefile

     

       16
       +
       @@ -59,7 +59,6 @@ res_install:

     

       17
       +
        	install -Dm 644 src/etc/*.ps1 -t $(DESTDIR)$(PREFIX)/share/wslu

     

       18
       +
        	install -Dm 644 src/etc/*.ico -t $(DESTDIR)$(PREFIX)/share/wslu

     

       19
       +
        	install -Dm 755 src/etc/*.sh -t $(DESTDIR)$(PREFIX)/share/wslu

     

       20
       +
       -	install -Dm 644 src/etc/*.desktop $(DESTDIR)$(PREFIX)/share/wslu

     

       21
       +
        	install -Dm 644 src/etc/conf $(DESTDIR)$(PREFIX)/share/wslu

     

       22
       +
        

     

       23
       +
        conf_install:

     

       24
       +
       diff --git a/src/etc/wslview.desktop b/src/etc/wslview.desktop

     

       25
       +
       index ebb84b6..235a365 100644

     

       26
       +
       --- a/src/etc/wslview.desktop

     

       27
       +
       +++ b/src/etc/wslview.desktop

     

       28
       +
       @@ -2,7 +2,7 @@

     

       29
       +
        Name=WSLView

     

       30
       +
        Comment=Open files and addresses in Windows

     

       31
       +
        Icon=windows

     

       32
       +
       -Exec=/usr/bin/wslview %U

     

       33
       +
       +Exec=wslview %U

     

       34
       +
        Terminal=false

     

       35
       +
        Type=Application

     

       36
       +
        Categories=Utility;

     

       37
       +
       -- 

     

       38
       +
       2.43.1

     

       39
       +

+7 -1

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

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchFromGitHub

     

       0
        
       
     

       4
        
       }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     
···

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "wslutilities";

     

       12
       -
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
        
           hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc=";

     

       15
        
         };

     

       16
        
       

     

       0
        
       
     

       0
        
       
     

       17
        
         patches = [

     

       18
        
           ./fallback-conf-nix-store.diff

     

       0
        
       
     

       19
        
         ];

     

       20
        
       

     

       21
        
         postPatch = ''

     
···

       27
        
           "DESTDIR=$(out)"

     

       28
        
           "PREFIX="

     

       29
        
         ];

     

       0
        
       
     

       0
        
       
     

       30
        
       

     

       31
        
         meta = with lib; {

     

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

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchFromGitHub

     

       4
       +
       , copyDesktopItems

     

       5
        
       }:

     

       6
        
       

     

       7
        
       stdenv.mkDerivation rec {

     
···

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "wslutilities";

     

       13
       +
           repo = "wslu";

     

       14
        
           rev = "v${version}";

     

       15
        
           hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc=";

     

       16
        
         };

     

       17
        
       

     

       18
       +
         nativeBuildInputs = [ copyDesktopItems ];

     

       19
       +
       

     

       20
        
         patches = [

     

       21
        
           ./fallback-conf-nix-store.diff

     

       22
       +
           ./fix-desktop-item.patch

     

       23
        
         ];

     

       24
        
       

     

       25
        
         postPatch = ''

     
···

       31
        
           "DESTDIR=$(out)"

     

       32
        
           "PREFIX="

     

       33
        
         ];

     

       34
       +
       

     

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

     

       36
        
       

     

       37
        
         meta = with lib; {

     

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

pkgs/tools/system/wslu/fallback-conf-nix-store.diff pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff

-2

pkgs/top-level/all-packages.nix

···

       14845
        
       

     

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

     

       14847
        
       

     

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

     

       14849
       -
       

     

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

     

       14851
        
       

     

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

···

       14845
        
       

     

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

     

       14847
        
       

     

       0
        
       
     

       0
        
       
     

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

     

       14849
        
       

     

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