diff options
author | Markus Kowalewski <markus.kowalewski@gmail.com> | 2018-03-11 17:56:26 -0700 |
---|---|---|
committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2018-03-11 17:56:26 -0700 |
commit | a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f (patch) | |
tree | c017d3810d0f7e799dcd05f575e5fdf09db4cc4f /pkgs/applications/editors/texmaker | |
parent | 37f6b0ff9cc05a80a5f1f31de9779ad7865bc4ac (diff) | |
download | nixlib-a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f.tar nixlib-a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f.tar.gz nixlib-a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f.tar.bz2 nixlib-a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f.tar.lz nixlib-a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f.tar.xz nixlib-a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f.tar.zst nixlib-a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f.zip |
texmaker: 4.5 -> 5.0.2
Diffstat (limited to 'pkgs/applications/editors/texmaker')
-rw-r--r-- | pkgs/applications/editors/texmaker/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 76c8e4ae0e44..c5f691e95c24 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -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='' |