about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2019-04-06 14:15:39 +0200
committerPascal Wittmann <mail@pascal-wittmann.de>2019-04-06 18:06:36 +0200
commitd5934d3dfcac7833f1879831391e8396bab45a31 (patch)
tree239f4d5a2ce95c4586171217ee4033b6813a95d0
parent9e9e73b1164e21e50a5c523a6c240a53822da8ff (diff)
downloadnixlib-d5934d3dfcac7833f1879831391e8396bab45a31.tar
nixlib-d5934d3dfcac7833f1879831391e8396bab45a31.tar.gz
nixlib-d5934d3dfcac7833f1879831391e8396bab45a31.tar.bz2
nixlib-d5934d3dfcac7833f1879831391e8396bab45a31.tar.lz
nixlib-d5934d3dfcac7833f1879831391e8396bab45a31.tar.xz
nixlib-d5934d3dfcac7833f1879831391e8396bab45a31.tar.zst
nixlib-d5934d3dfcac7833f1879831391e8396bab45a31.zip
zim: 0.69.1 -> 0.70
-rw-r--r--pkgs/applications/office/zim/default.nix17
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 48027c194da6..81c254763d3a 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook }:
 
 #
 # TODO: Declare configuration options for the following optional dependencies:
@@ -7,22 +7,17 @@
 #  -  pyxdg: Need to make it work first (see setupPyInstallFlags).
 #
 
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "zim-${version}";
-  version = "0.69.1";
+  version = "0.70";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
-    sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq";
+    sha256 = "1g1xj86iph1a2k4n9yykq0gipbd5jdd7fsh9qpv4v2h5lggadjdd";
   };
 
-  propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
-
-  preBuild = ''
-    export HOME=$TMP
-
-    sed -i '/zim_install_class,/d' setup.py
-  '';
+  buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ];
+  propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
 
 
   preFixup = ''