From 485f5443df89ec2181371ba894c9fe37bab8756c Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Tue, 8 Jan 2019 19:49:56 +0100
Subject: [PATCH] tikzit: 2.0 -> 2.1

---
 pkgs/tools/typesetting/tikzit/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 23d8093606be..69e3995bf624 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, flex, bison }:
+{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "tikzit-${version}";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "tikzit";
     repo = "tikzit";
-    rev = "v${version}";
-    sha256 = "0fwxr9rc9vmw2jzpj084rygzyhp4xm3vm737668az600ln2scyad";
+    # We don't reference the revision by the appropriate tag (v2.1) here,
+    # as the version of that tag still has the old version number in the
+    # relevant header file. This would cause a bad user experience, as
+    # "Help > About" would still display the old version number even though
+    # we indeed ship the new version 2.1.
+    rev = "97c2a2a7ecae12bf376558997805c24c3b6e3e07";
+    sha256 = "0sbgijbln18gac9989x484r62jlxyagkq0ap0fvzislrkac4z3y9";
   };
 
   nativeBuildInputs = [ qmake qttools flex bison ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qtbase libsForQt5.poppler ];
 
   enableParallelBuilding = true;
 
@@ -22,6 +27,7 @@ stdenv.mkDerivation rec {
       TikZiT is a simple GUI editor for graphs and string diagrams.
       Its native file format is a subset of PGF/TikZ, which means TikZiT files
       can be included directly in papers typeset using LaTeX.
+      For preview support the texlive package 'preview' has to be installed.
     '';
     homepage = https://tikzit.github.io/;
     license = licenses.gpl3Plus;