From 5306cc2bb9ee31566a0640901b066cb0b7aa0741 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 7 Aug 2025 23:05:58 +0200 Subject: [PATCH] leo-editor: cleanup --- pkgs/by-name/le/leo-editor/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/le/leo-editor/package.nix b/pkgs/by-name/le/leo-editor/package.nix index 1ac0832c5610..669d500df467 100644 --- a/pkgs/by-name/le/leo-editor/package.nix +++ b/pkgs/by-name/le/leo-editor/package.nix @@ -8,15 +8,15 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "leo-editor"; version = "6.8.6.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; - rev = version; - sha256 = "sha256-3ojiIjsGJpPgVSUi0QhIddqwsDxfRWxhxAQ5YmzwZiQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3ojiIjsGJpPgVSUi0QhIddqwsDxfRWxhxAQ5YmzwZiQ="; }; dontBuild = true; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { makeWrapper python3 ]; + propagatedBuildInputs = with python3.pkgs; [ pyqt6 docutils @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { exec = "leo %U"; icon = "leoapp32"; type = "Application"; - comment = meta.description; + comment = finalAttrs.meta.description; desktopName = "Leo"; genericName = "Text Editor"; categories = [ @@ -82,6 +83,8 @@ stdenv.mkDerivation rec { }; installPhase = '' + runHook preInstall + mkdir -p "$out/share/icons/hicolor/32x32/apps" cp leo/Icons/leoapp32.png "$out/share/icons/hicolor/32x32/apps" @@ -96,17 +99,19 @@ stdenv.mkDerivation rec { --add-flags "-O $out/share/leo-editor/launchLeo.py" wrapQtApp $out/bin/leo + + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://leo-editor.github.io/leo-editor/"; description = "Powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leonardoce kashw2 ]; mainProgram = "leo"; }; -} +})