diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-08 00:10:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-08 00:10:21 +0100 |
commit | e4eb5b5fcc33d6a584bb3542b0dcb1c7abe21f79 (patch) | |
tree | 7a585cf61492493591f968489c6b2a90ff77ec2e /pkgs | |
parent | 473d080eb900671b84adc597457f5e760ab6afd2 (diff) | |
parent | 70330b7e69978310f569a9a4cfc2351cfbc48e57 (diff) |
Merge pull request #293741 from eclairevoyant/wslu
wslu: install desktop item; move to by-name
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff (renamed from pkgs/tools/system/wslu/fallback-conf-nix-store.diff) | 0 | ||||
-rw-r--r-- | pkgs/by-name/ws/wslu/fix-desktop-item.patch | 39 | ||||
-rw-r--r-- | pkgs/by-name/ws/wslu/package.nix (renamed from pkgs/tools/system/wslu/default.nix) | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 46 insertions, 3 deletions
diff --git a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff index 6315e78d7de4e..6315e78d7de4e 100644 --- a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff +++ b/pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff diff --git a/pkgs/by-name/ws/wslu/fix-desktop-item.patch b/pkgs/by-name/ws/wslu/fix-desktop-item.patch new file mode 100644 index 0000000000000..5645cff98ae6e --- /dev/null +++ b/pkgs/by-name/ws/wslu/fix-desktop-item.patch @@ -0,0 +1,39 @@ +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/tools/system/wslu/default.nix b/pkgs/by-name/ws/wslu/package.nix index 6337e479bb31e..422b8e76efb68 100644 --- a/pkgs/tools/system/wslu/default.nix +++ b/pkgs/by-name/ws/wslu/package.nix @@ -1,6 +1,7 @@ { 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f95cc9b1f3933..bbe62d82f23e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |