alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

texmaker: 4.5 -> 5.0.2

Browse source
This commit is contained in:
Markus Kowalewski 2018-03-11 17:56:26 -07:00
parent 37f6b0ff9c
commit a9ee6d2dab
No known key found for this signature in database
GPG key ID: D865C8A91D7025EB
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/editors/texmaker/default.nix
View file

@ -1,23 +1,26 @@
{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }:
{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
stdenv.mkDerivation rec {
pname = "texmaker";
version = "4.5";
version = "5.0.2";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c";
sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9";
};
buildInputs = [ qt4 poppler_qt4 zlib ];
nativeBuildInputs = [ pkgconfig poppler qmake4Hook ];
buildInputs = [ qtbase qtscript poppler zlib ];
nativeBuildInputs = [ pkgconfig poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
preConfigure = ''
qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps"
qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "TeX and LaTeX editor";
longDescription=''

4
pkgs/top-level/all-packages.nix
View file

@ -2290,7 +2290,7 @@ with pkgs;
flameGraph = flamegraph;
flvtool2 = callPackage ../tools/video/flvtool2 { };
fmbt = callPackage ../development/tools/fmbt {
python = python2;
};
@ -4997,7 +4997,7 @@ with pkgs;
extraFonts = true;
};
texmaker = callPackage ../applications/editors/texmaker { };
texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
texstudio = callPackage ../applications/editors/texstudio { };