From 21d57e33c878b7810e98bf804aeb8a16e5ead389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Tue, 5 May 2015 19:51:28 +0000
Subject: [PATCH 1/2] Update of TexStudio from 2.7.0 to 2.9.4

---
 pkgs/applications/editors/texstudio/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 5cb31af797d..4b0cccae364 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, qt4, poppler_qt4, zlib}:
+{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
-  version = "2.7.0";
+  version = "2.9.4";
   name = "${pname}-${version}";
   altname="Texstudio";
 
   src = fetchurl {
     url = "mirror://sourceforge/texstudio/${name}.tar.gz";
-    sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
+    sha256 = "1smmc4xqs8x8qzp6iqj2wr4xarfnxxxp6rq6chx1kb256w75jwfw";
   };
 
-  buildInputs = [ qt4 poppler_qt4 zlib ];
+  buildInputs = [ qt4 poppler_qt4 zlib pkgconfig];
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) "
-    qmake PREFIX=$out texstudio.pro
+    qmake PREFIX=$out NO_APPDATA=True texstudio.pro
   '';
 
   meta = with stdenv.lib; {

From fc82638b33a653c5eee807e2f715666edb1e7c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Tue, 5 May 2015 20:30:13 +0000
Subject: [PATCH 2/2] Update TexMaker from 4.1.1 to 4.4.1

---
 pkgs/applications/editors/texmaker/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 4df2dc8cac1..04ebf195108 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -2,20 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "texmaker";
-  version = "4.1.1";
+  version = "4.4.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
-    sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z";
+    sha256 = "1d5lb4sibdhvzgfr0zi48j92b4acvvvdy2biqi3jzjdnzy9r94w0";
   };
 
   buildInputs = [ qt4 poppler_qt4 zlib ];
-
   nativeBuildInputs = [ pkgconfig poppler ];
+  NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler";
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler}/include/poppler/) " # for poppler-config.h
     qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro
   '';