From 22809c01e4928fa58d986701ffc6a631edf58a4b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 16 Apr 2025 09:39:41 +0800
Subject: [PATCH] banana-accounting: 10.0.12 -> 10.1.24

---
 pkgs/by-name/ba/banana-accounting/package.nix | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/ba/banana-accounting/package.nix b/pkgs/by-name/ba/banana-accounting/package.nix
index b1e455bbf6c3..2be9b632bf7c 100644
--- a/pkgs/by-name/ba/banana-accounting/package.nix
+++ b/pkgs/by-name/ba/banana-accounting/package.nix
@@ -1,31 +1,33 @@
 {
+  lib,
+  stdenv,
+  fetchurl,
   autoPatchelfHook,
+  wrapGAppsHook3,
   cairo,
   e2fsprogs,
-  fetchurl,
   gmp,
   gtk3,
   libGL,
   libX11,
-  lib,
-  stdenv,
   libgcrypt,
-  wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "banana-accounting";
-  version = "10.0.12";
+  version = "10.1.24";
 
   srcs = fetchurl {
-    url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";
-    hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw=";
+    url = "https://web.archive.org/web/20250416013207/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";
+    hash = "sha256-5GewPGOCyeS6faL8aMUZ/JDUUn2PGuur0ws/7nlNX6M=";
   };
 
   sourceRoot = ".";
 
-  dontConfigure = true;
-  dontBuild = true;
+  nativeBuildInputs = [
+    autoPatchelfHook
+    wrapGAppsHook3
+  ];
 
   buildInputs = [
     cairo
@@ -38,25 +40,28 @@ stdenv.mkDerivation {
     libgcrypt
   ];
 
-  nativeBuildInputs = [
-    autoPatchelfHook
-    wrapGAppsHook3
-  ];
+  dontConfigure = true;
+
+  dontBuild = true;
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/bin
-    mv ./* $out
-    ln -s $out/usr/bin/bananaplus $out/bin/
+
+    mkdir -p $out/opt $out/bin $out/share
+    cp -r . $out/opt/banana-accounting
+    ln -s $out/opt/banana-accounting/usr/bin/bananaplus $out/bin/bananaplus
+    ln -s $out/opt/banana-accounting/usr/share/applications $out/share/applications
+    ln -s $out/opt/banana-accounting/usr/share/icons $out/share/icons
+
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Accounting Software for small companies, associations and individuals";
-    homepage = "https://www.banana.ch/";
-    license = licenses.unfree;
+    homepage = "https://www.banana.ch";
+    license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ jacg ];
+    maintainers = with lib.maintainers; [ jacg ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
-}
+})