From a0a59a8131a7be8e2a98a5dc82610eab9cb0e117 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Wed, 20 Sep 2023 20:27:09 +0300 Subject: [PATCH 1/4] fend: add mainProgram --- pkgs/tools/misc/fend/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index ad65708b435..091f4e16e88 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/printfn/fend"; license = licenses.mit; maintainers = with maintainers; [ djanatyn ]; + mainProgram = "fend"; }; } From 9740d7bb58414ce45fcb8cf17acbc115aef01557 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Wed, 20 Sep 2023 20:27:35 +0300 Subject: [PATCH 2/4] fend: add a desktop file --- pkgs/tools/misc/fend/default.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 091f4e16e88..893094b3ba1 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -5,6 +5,8 @@ , darwin , pandoc , installShellFiles +, copyDesktopItems +, makeDesktopItem }: rustPlatform.buildRustPackage rec { @@ -20,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-oAkZHx33YrwRUUIoooqpy72QCq0ZkAgBZ8W8XDe2fNE="; - nativeBuildInputs = [ pandoc installShellFiles ]; + nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postBuild = '' @@ -38,6 +40,23 @@ rustPlatform.buildRustPackage rec { [[ "$($out/bin/fend "1 km to m")" = "1000 m" ]] ''; + postInstall = '' + install -D -m 444 $src/icon/fend-icon-256.png $out/share/icons/hicolor/256x256/apps/fend.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "fend"; + desktopName = "fend"; + genericName = "Calculator"; + comment = "Arbitrary-precision unit-aware calculator"; + icon = "fend"; + exec = "fend"; + terminal = true; + categories = [ "Utility" "Calculator" "ConsoleOnly" ]; + }) + ]; + meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; homepage = "https://github.com/printfn/fend"; From 1c5ade21cce3e00604254c47d6541ff1e3493910 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Wed, 20 Sep 2023 20:33:00 +0300 Subject: [PATCH 3/4] fend: add updateScript --- pkgs/tools/misc/fend/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 893094b3ba1..46277cbb812 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -7,6 +7,7 @@ , installShellFiles , copyDesktopItems , makeDesktopItem +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -57,6 +58,8 @@ rustPlatform.buildRustPackage rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; homepage = "https://github.com/printfn/fend"; From fdf790bbe4449b8459a7ae3f3a3b5805782887f0 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Wed, 20 Sep 2023 20:33:41 +0300 Subject: [PATCH 4/4] fend: add liff as a maintainer --- pkgs/tools/misc/fend/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 46277cbb812..d2b945850f3 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { description = "Arbitrary-precision unit-aware calculator"; homepage = "https://github.com/printfn/fend"; license = licenses.mit; - maintainers = with maintainers; [ djanatyn ]; + maintainers = with maintainers; [ djanatyn liff ]; mainProgram = "fend"; }; }