From f082792652ce50109505138ceed42252a48d8220 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 26 Oct 2025 10:38:24 -0300 Subject: [PATCH] pro-office-calculator: modernize --- .../pr/pro-office-calculator/package.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/pr/pro-office-calculator/package.nix b/pkgs/by-name/pr/pro-office-calculator/package.nix index 88894e2fb99d..05e5f044009a 100644 --- a/pkgs/by-name/pr/pro-office-calculator/package.nix +++ b/pkgs/by-name/pr/pro-office-calculator/package.nix @@ -1,37 +1,39 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, tinyxml-2, cmake, - qtbase, - qtmultimedia, + qt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0.13"; pname = "pro-office-calculator"; src = fetchFromGitHub { owner = "RobJinman"; repo = "pro_office_calc"; - rev = "v${version}"; - sha256 = "1v75cysargmp4fk7px5zgib1p6h5ya4w39rndbzk614fcnv0iipd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7cYItmWOBDP/ajanwYnyBZobVny/9HumI7e+rLRn5ew="; }; buildInputs = [ - qtbase - qtmultimedia + qt5.qtbase + qt5.qtmultimedia tinyxml-2 ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; - meta = with lib; { + meta = { description = "Completely normal office calculator"; mainProgram = "procalc"; homepage = "https://proofficecalculator.com/"; - maintainers = [ maintainers.pmiddend ]; - platforms = platforms.linux; - license = licenses.gpl3; + maintainers = with lib.maintainers; [ pmiddend ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Only; }; -} +})