From 87734a9f1cbcc23cccd299fc6079af7b41c1672c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:44:09 -0400 Subject: [PATCH 1/3] yazi-unwrapped: fix `pname` misuse --- pkgs/by-name/ya/yazi-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 275f2cdf888a..4db210ec697d 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sxyazi"; - repo = pname; + repo = "yazi"; rev = "v${version}"; hash = "sha256-c8fWWCOVBqQVdQch9BniCaJPrVEOCv35lLH8/hMIbvE="; }; From 251b7c94044bdda672cf3f9df74a68ae0e07f651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:44:23 -0400 Subject: [PATCH 2/3] yazi-unwrapped: remove `meta = with lib;` --- pkgs/by-name/ya/yazi-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 4db210ec697d..d77c67128042 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Blazing fast terminal file manager written in Rust, based on async I/O"; homepage = "https://github.com/sxyazi/yazi"; - license = licenses.mit; - maintainers = with maintainers; [ xyenon matthiasbeyer ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xyenon matthiasbeyer ]; mainProgram = "yazi"; }; } From 753b87aa211cb013e04b0e488f3638ae508483bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:44:33 -0400 Subject: [PATCH 3/3] yazi-unwrapped: install desktop file and icon --- pkgs/by-name/ya/yazi-unwrapped/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index d77c67128042..9bf70a864538 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -32,6 +32,9 @@ rustPlatform.buildRustPackage rec { --bash ./yazi-boot/completions/yazi.bash \ --fish ./yazi-boot/completions/yazi.fish \ --zsh ./yazi-boot/completions/_yazi + + install -Dm444 assets/yazi.desktop -t $out/share/applications + install -Dm444 assets/logo.png $out/share/pixmaps/yazi.png ''; passthru.updateScript = nix-update-script { };