1 files changed, 11 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix
index 4265e0ef1046..5d435fa68231 100644
--- a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix
+++ b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix
@@ -2,45 +2,42 @@
 , wrapGAppsHook, pkg-config, desktop-file-utils
 , appstream-glib, pythonPackages, glib, gobject-introspection
 , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
-, shared-mime-info, haskellPackages}:
+, shared-mime-info, haskellPackages, libhandy
+}:
 
 let
-  pythonEnv = pythonPackages.python.withPackages(p: with p;
-    [ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]);
-  texliveDist = texlive.combined.scheme-medium;
+  pythonEnv = pythonPackages.python.withPackages(p: with p; [
+    regex setuptools python-Levenshtein pyenchant
+    pygobject3 pycairo pypandoc chardet
+  ]);
 
 in stdenv.mkDerivation rec {
   pname = "apostrophe";
-  version = "2.2.0.3";
+  version = "2.4";
 
   src = fetchFromGitLab {
     owner  = "somas";
     repo   = pname;
     domain = "gitlab.gnome.org";
     rev    = "v${version}";
-    sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879";
+    sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz";
   };
 
   nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils
     appstream-glib wrapGAppsHook ];
 
   buildInputs = [ glib pythonEnv gobject-introspection gtk3
-    gnome3.adwaita-icon-theme webkitgtk gspell texliveDist
-    glib-networking ];
+    gnome3.adwaita-icon-theme webkitgtk gspell texlive
+    glib-networking libhandy ];
 
   postPatch = ''
     patchShebangs --build build-aux/meson_post_install.py
-
-    substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}"
-
-    # get rid of unused distributed dependencies
-    rm -r ${pname}/pylocales
   '';
 
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"
-      --prefix PATH : "${texliveDist}/bin"
+      --prefix PATH : "${texlive}/bin"
       --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin"
       --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
     )