1 files changed, 27 insertions, 15 deletions
diff --git a/pkgs/flat-manager-client/package.nix b/pkgs/flat-manager-client/package.nix
index 0390a90..2e401cf 100644
--- a/pkgs/flat-manager-client/package.nix
+++ b/pkgs/flat-manager-client/package.nix
@@ -1,39 +1,51 @@
 {
-  lib,
-  stdenvNoCC,
   flat-manager,
-  python3,
+  gobject-introspection,
   ostree,
+  python3,
+  stdenvNoCC,
+  wrapGAppsNoGuiHook,
 }:
+
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "flat-manager-client";
   inherit (flat-manager) version src;
 
-  pythonPath = with python3.pkgs; [
+  nativeBuildInputs = [
+    gobject-introspection
+    python3
+    python3.pkgs.wrapPython
+    wrapGAppsNoGuiHook
+  ];
+
+  buildInputs = [ ostree ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    python
+
     aiohttp
     pygobject3
     tenacity
   ];
 
-  nativeBuildInputs = [ python3.pkgs.wrapPython ];
-  buildInputs = [ (python3.withPackages (lib.const finalAttrs.pythonPath)) ];
-
   installPhase = ''
     runHook preInstall
     install -Dm755 {,$out/bin/}flat-manager-client
     runHook postInstall
   '';
 
-  postFixup = ''
-    makeWrapperArgs+=(
-      --prefix GI_TYPELIB_PATH : ${lib.makeSearchPath "lib/girepository-1.0" [ ostree ]}
-    )
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
 
-    wrapPythonPrograms $out/bin $out "$pythonPath"
-  '';
+  postFixup = "wrapPythonPrograms";
 
-  meta = flat-manager.meta // {
-    mainProgram = "flat-manager-client";
+  meta = {
+    inherit (flat-manager.meta)
+      homepage
+      changelog
+      maintainers
+      platforms
+      ;
     description = flat-manager.meta.description + " (Client)";
+    mainProgram = "flat-manager-client";
   };
 })