From 7fec0b58324029f2afb30e7f8a8a0622c7552c91 Mon Sep 17 00:00:00 2001
From: Chaddaï Fouché <chaddai.fouche@gmail.com>
Date: Thu, 24 Apr 2014 10:52:42 +0200
Subject: Fixed pkgconfig support for poppler-qt4

---
 pkgs/development/libraries/poppler/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 1e1452f4578b..b9412b37cbad 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -66,7 +66,11 @@ let
     propagatedBuildInputs = [ qt4 poppler_glib ];
     patches = qtcairo_patches;
     NIX_LDFLAGS = "-lpoppler";
-    postConfigure = "cd qt4";
+    postConfigure = ''
+      mkdir -p "$out/lib/pkgconfig"
+      install -c -m 644 poppler-qt4.pc "$out/lib/pkgconfig"
+      cd qt4
+    '';
   };
 
 in { inherit poppler_glib poppler_qt4; } // poppler_glib
-- 
cgit 1.4.1


From 31b58dccfe162c43f56945f4444e7fa3a1d566da Mon Sep 17 00:00:00 2001
From: Chaddaï Fouché <chaddai.fouche@gmail.com>
Date: Thu, 24 Apr 2014 10:54:09 +0200
Subject: Added TeXmaker package : an advanced editor for latex

---
 pkgs/applications/editors/texmaker/default.nix | 34 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/editors/texmaker/default.nix

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
new file mode 100644
index 000000000000..16335a550653
--- /dev/null
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, qt4, popplerQt4, zlib, pkgconfig, poppler}:
+
+stdenv.mkDerivation rec {
+  pname = "texmaker";
+  version = "4.1.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
+    sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z";
+  };
+
+  buildInputs = [ qt4 popplerQt4 zlib ];
+
+  nativeBuildInputs = [ pkgconfig 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
+  '';
+
+  meta = with stdenv.lib; {
+    description = "TeX and LaTeX editor";
+    longDescription=''
+	This editor is a full fledged IDE for TeX and
+	LaTeX editing with completion, structure viewer, preview,
+	spell checking and support of any compilation chain.
+	'';
+    homepage = "http://www.xm1math.net/texmaker/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cfouche ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d1961996155..23675df7ac54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2055,6 +2055,8 @@ let
     guile = guile_1_8;
   };
 
+  texmaker = callPackage ../applications/editors/texmaker { };
+
   tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
 
   tinc = callPackage ../tools/networking/tinc { };
-- 
cgit 1.4.1


From 3701fdf0663ea48dc20deddc29bc8e1f543f25d8 Mon Sep 17 00:00:00 2001
From: Chaddaï Fouché <chaddai.fouche@gmail.com>
Date: Thu, 24 Apr 2014 11:40:06 +0200
Subject: Adding myself to lib/maintainers.nix

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 78355eff0045..8a01b622158b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -23,6 +23,7 @@
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
+  cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
-- 
cgit 1.4.1