From 13c6b9ba8549c3db91c6f321e0413a538bce9388 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 13 Mar 2016 21:43:42 +0100
Subject: [PATCH] zim: 0.63 -> 0.65

---
 pkgs/applications/office/zim/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 4d2396e8a11..9014e388468 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,19 +9,18 @@
 
 buildPythonApplication rec {
   name = "zim-${version}";
-  version = "0.63";
+  version = "0.65";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
-    sha256 = "077vf4h0hjmbk8bxj9l0z9rxcb3dw642n32lvfn6vjdna1qm910m";
+    sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl";
   };
 
   propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject ];
 
   preBuild = ''
-    mkdir -p /tmp/home
-    export HOME="/tmp/home"
+    export HOME=$TMP
 
     sed -i '/zim_install_class,/d' setup.py
   '';
@@ -30,8 +29,14 @@ buildPythonApplication rec {
   preFixup = ''
     export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
   '';
-  # Testing fails.
-  doCheck = false;
+
+  postFixup = ''
+    wrapPythonPrograms
+    substituteInPlace $out/bin/.zim-wrapped \
+    --replace "sys.argv[0] = 'zim'" "sys.argv[0] = '$out/bin/zim'"
+  '';
+
+  doCheck = true;
 
   meta = {
       description = "A desktop wiki";