texmaker: 4.5 -> 5.0.2

+11 -8
+9 -6
pkgs/applications/editors/texmaker/default.nix
··· 1 - { stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }: 1 + { stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "texmaker"; 5 - version = "4.5"; 5 + version = "5.0.2"; 6 6 name = "${pname}-${version}"; 7 7 8 8 src = fetchurl { 9 9 url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; 10 - sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c"; 10 + sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9"; 11 11 }; 12 12 13 - buildInputs = [ qt4 poppler_qt4 zlib ]; 14 - nativeBuildInputs = [ pkgconfig poppler qmake4Hook ]; 13 + buildInputs = [ qtbase qtscript poppler zlib ]; 14 + nativeBuildInputs = [ pkgconfig poppler qmake ]; 15 15 NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; 16 16 17 17 preConfigure = '' 18 - qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps" 18 + qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo" 19 19 ''; 20 + 21 + 22 + enableParallelBuilding = true; 20 23 21 24 meta = with stdenv.lib; { 22 25 description = "TeX and LaTeX editor";
+2 -2
pkgs/top-level/all-packages.nix
··· 2290 2290 flameGraph = flamegraph; 2291 2291 2292 2292 flvtool2 = callPackage ../tools/video/flvtool2 { }; 2293 - 2293 + 2294 2294 fmbt = callPackage ../development/tools/fmbt { 2295 2295 python = python2; 2296 2296 }; ··· 4997 4997 extraFonts = true; 4998 4998 }; 4999 4999 5000 - texmaker = callPackage ../applications/editors/texmaker { }; 5000 + texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; 5001 5001 5002 5002 texstudio = callPackage ../applications/editors/texstudio { }; 5003 5003