From cb9c6a758bb26fe1ead0e85b1ad71c47fa5c3767 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Sat, 7 Mar 2020 12:20:42 +0000
Subject: [PATCH] paperwork: 1.2.4 -> 1.3.1

Also install paperwork-shell and desktop file
---
 .../applications/office/paperwork/backend.nix | 13 ++---
 .../applications/office/paperwork/default.nix | 49 +++++++++++++------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
index 7f82780fbe9..c28a4bc916d 100644
--- a/pkgs/applications/office/paperwork/backend.nix
+++ b/pkgs/applications/office/paperwork/backend.nix
@@ -3,14 +3,15 @@
 , isPy3k, isPyPy
 
 , pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor
-, python-Levenshtein, pyinsane2, pygobject3, pyocr, natsort
+, python-Levenshtein, pygobject3, pyocr, natsort, libinsane
+, distro
 
 , pkgs
 }:
 
 buildPythonPackage rec {
   pname = "paperwork-backend";
-  version = "1.2.4";
+  version = "1.3.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -18,7 +19,7 @@ buildPythonPackage rec {
     group = "World";
     owner = "OpenPaperwork";
     rev = version;
-    sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4";
+    sha256 = "1219yz8z4r1yn6miq8zc2z1m1lnhf3dmkhwfw23n05bg842nvg65";
   };
 
   sourceRoot = "source/paperwork-backend";
@@ -34,14 +35,14 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     pyenchant simplebayes pillow pycountry whoosh termcolor
-    python-Levenshtein pyinsane2 pygobject3 pyocr natsort
-    pkgs.poppler_gi pkgs.gtk3
+    python-Levenshtein libinsane pygobject3 pyocr natsort
+    pkgs.poppler_gi pkgs.gtk3 distro
   ];
 
   meta = {
     description = "Backend part of Paperwork (Python API, no UI)";
     homepage = https://openpaper.work/;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.aszlig ];
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
   };
 }
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 3506ea8b551..c3930115365 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -1,7 +1,15 @@
-{ lib, python3Packages, gtk3, cairo
-, aspellDicts, buildEnv
-, gnome3, librsvg
-, xvfb_run, dbus, libnotify
+{ lib
+, python3Packages
+, gtk3
+, cairo
+, aspellDicts
+, buildEnv
+, gnome3
+, librsvg
+, xvfb_run
+, dbus
+, libnotify
+, wrapGAppsHook
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -46,9 +54,23 @@ python3Packages.buildPythonApplication rec {
     paths = lib.collect lib.isDerivation aspellDicts;
   }}/lib/aspell";
 
+  postInstall = ''
+    # paperwork-shell needs to be re-wrapped with access to paperwork
+    cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell
+    # install desktop files and icons
+    XDG_DATA_HOME=$out/share $out/bin/paperwork-shell install
+  '';
+
   checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+
   buildInputs = [
-    gnome3.adwaita-icon-theme libnotify librsvg
+    gnome3.adwaita-icon-theme
+    libnotify
+    librsvg
   ];
 
   # A few parts of chkdeps need to have a display and a dbus session, so we not
@@ -61,21 +83,20 @@ python3Packages.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with python3Packages; [
-    paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools pandas
-  ];
-
-  makeWrapperArgs = [
-    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
-    "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
-    "--prefix XDG_DATA_DIRS : \"$out/share\""
-    "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
+    paperwork-backend
+    pypillowfight
+    gtk3
+    cairo
+    pyxdg
+    dateutil
+    setuptools
   ];
 
   meta = {
     description = "A personal document manager for scanned documents";
     homepage = https://openpaper.work/;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.aszlig ];
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
     platforms = lib.platforms.linux;
   };
 }