Merge pull request #2368 from Chaddai/texmaker

TeXmaker
This commit is contained in:
Peter Simons 2014-04-28 22:42:47 +02:00
commit 3445df42a4
4 changed files with 42 additions and 1 deletions

View File

@ -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>";

View File

@ -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 ];
};
}

View File

@ -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

View File

@ -2057,6 +2057,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 { };