From f86180a4acd3f6f59f21536d09f985ee1de9fba9 Mon Sep 17 00:00:00 2001
From: jetcookies <226018678+jetcookies@users.noreply.github.com>
Date: Wed, 21 Jan 2026 15:39:23 +0800
Subject: [PATCH] build(package.nix): add wrapGAppsHook3 & copyDesktopItems to
 nativeBuildInputs

---
 package.nix | 60 ++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/package.nix b/package.nix
index d82e6ea..b0324ac 100644
--- a/package.nix
+++ b/package.nix
@@ -5,18 +5,16 @@
   fetchFromGitHub,
   makeDesktopItem,
 
-  cargo-tauri,
   pkg-config,
+  cargo-tauri,
+  wrapGAppsHook3,
+  copyDesktopItems,
 
-  atkmm,
-  eudev,
-  gdk-pixbuf,
   glib,
   gtk3,
-  libgudev,
-  libsoup_3,
-  pango,
+  openssl,
   pcsclite,
+  udev,
   webkitgtk_4_1,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -32,13 +30,32 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   cargoRoot = "src-tauri";
-
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
   cargoHash = "sha256-nLf8v4MIt2zAeA9YMVaoI3s/yut5/Jy2fGM3Sx33EJc=";
 
-  npmDist = buildNpmPackage {
-    name = "${finalAttrs.pname}-${finalAttrs.version}-dist";
+  postPatch = ''
+    sed -i src-tauri/tauri.conf.json -e '/beforeBuildCommand/d'
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    cargo-tauri.hook
+    wrapGAppsHook3
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    openssl
+    pcsclite
+    udev
+    webkitgtk_4_1
+  ];
+
+  frontendDist = buildNpmPackage {
+    name = "${finalAttrs.pname}-${finalAttrs.version}-frontend-dist";
     inherit (finalAttrs) src;
 
     npmDepsHash = "sha256-7DLooiGLzk3JRsKAftOxSf7HAgHBXCJDaAFp2p/pryc=";
@@ -54,28 +71,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   preBuild = ''
-    sed -i '/beforeBuildCommand/d' src-tauri/tauri.conf.json
-    cp -r ${finalAttrs.npmDist} build
+    cp -r ${finalAttrs.frontendDist} build
   '';
 
-  nativeBuildInputs = [
-    cargo-tauri.hook
-    pkg-config
-  ];
-
-  buildInputs = [
-    atkmm
-    eudev
-    gdk-pixbuf
-    glib
-    gtk3
-    libgudev
-    libsoup_3
-    pango
-    pcsclite
-    webkitgtk_4_1
-  ];
-
   postInstall = ''
     install -Dm644 ${finalAttrs.src}/static/in.suyogtandel.picoforge.svg $out/share/icons/hicolor/scalable/apps/picoforge.svg
   '';
@@ -97,7 +95,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/librekeys/picoforge/releases/tag/v${finalAttrs.version}";
-    description = "An open source commissioning tool for Pico FIDO security keys.";
+    description = "An open source commissioning tool for Pico FIDO security keys";
     homepage = "https://github.com/librekeys/picoforge";
     license = lib.licenses.agpl3Only;
     mainProgram = "picoforge";