public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36838 from markuskowa/texmaker-pr

Browse Source 
texmaker: 4.5 -> 5.0.2
This commit is contained in:
Matthew Justin Bauer 2018-03-19 12:25:05 -05:00 committed by GitHub
commit 11c34d55bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 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 { stdenv.mkDerivation rec {
pname = "texmaker"; pname = "texmaker";
version = "4.5"; version = "5.0.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c"; sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9";
}; };
buildInputs = [ qt4 poppler_qt4 zlib ]; buildInputs = [ qtbase qtscript poppler zlib ];
nativeBuildInputs = [ pkgconfig poppler qmake4Hook ]; nativeBuildInputs = [ pkgconfig poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
preConfigure = '' 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; { meta = with stdenv.lib; {
description = "TeX and LaTeX editor"; description = "TeX and LaTeX editor";
longDescription='' longDescription=''

2
pkgs/top-level/all-packages.nix
View File

@ -5021,7 +5021,7 @@ with pkgs;
extraFonts = true; extraFonts = true;
}; };
texmaker = callPackage ../applications/editors/texmaker { }; texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
texstudio = callPackage ../applications/editors/texstudio { }; texstudio = callPackage ../applications/editors/texstudio { };