diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/texmaker/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 41 insertions, 1 deletions
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/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 091d27edece8..6bc2b51f3dae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |