diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-19 12:25:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-19 12:25:05 -0500 |
commit | 11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c (patch) | |
tree | 2bc4b5666aaaa4bc5c2e8e49688ed89d78aa4ff6 /pkgs/applications/editors | |
parent | 08a9e31c42b8df70debc1b0d2366f9cda64428ce (diff) | |
parent | a9ee6d2dab4f5d3940acc40658eee6b1004ddf8f (diff) | |
download | nixlib-11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c.tar nixlib-11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c.tar.gz nixlib-11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c.tar.bz2 nixlib-11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c.tar.lz nixlib-11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c.tar.xz nixlib-11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c.tar.zst nixlib-11c34d55bf58fd15d8eeaadc393a1ea2e9c78b7c.zip |
Merge pull request #36838 from markuskowa/texmaker-pr
texmaker: 4.5 -> 5.0.2
Diffstat (limited to 'pkgs/applications/editors')
-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='' |