diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-05-06 04:39:49 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-05-06 04:39:49 +0300 |
| commit | dfaf86119e5886108737e1f04f7d9ad5fae7347f (patch) | |
| tree | b2fe8f627b9b5792b387968e0b852e329ae7195a | |
| parent | c4103181ce7cd5363716dee1f5a76e52b99cc723 (diff) | |
| parent | fc82638b33a653c5eee807e2f715666edb1e7c6f (diff) | |
| download | nixlib-dfaf86119e5886108737e1f04f7d9ad5fae7347f.tar nixlib-dfaf86119e5886108737e1f04f7d9ad5fae7347f.tar.gz nixlib-dfaf86119e5886108737e1f04f7d9ad5fae7347f.tar.bz2 nixlib-dfaf86119e5886108737e1f04f7d9ad5fae7347f.tar.lz nixlib-dfaf86119e5886108737e1f04f7d9ad5fae7347f.tar.xz nixlib-dfaf86119e5886108737e1f04f7d9ad5fae7347f.tar.zst nixlib-dfaf86119e5886108737e1f04f7d9ad5fae7347f.zip | |
Merge pull request #7714 from Chaddai/texmaker
Texmaker and TeXStudio update
| -rw-r--r-- | pkgs/applications/editors/texmaker/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/editors/texstudio/default.nix | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 4df2dc8cac14..04ebf195108f 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -2,20 +2,19 @@ stdenv.mkDerivation rec { pname = "texmaker"; - version = "4.1.1"; + version = "4.4.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${name}.tar.bz2"; - sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z"; + sha256 = "1d5lb4sibdhvzgfr0zi48j92b4acvvvdy2biqi3jzjdnzy9r94w0"; }; buildInputs = [ qt4 poppler_qt4 zlib ]; - nativeBuildInputs = [ pkgconfig poppler ]; + NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler"; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler}/include/poppler/) " # for poppler-config.h qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro ''; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 5cb31af797d5..4b0cccae3648 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, qt4, poppler_qt4, zlib}: +{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig}: stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.7.0"; + version = "2.9.4"; name = "${pname}-${version}"; altname="Texstudio"; src = fetchurl { url = "mirror://sourceforge/texstudio/${name}.tar.gz"; - sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831"; + sha256 = "1smmc4xqs8x8qzp6iqj2wr4xarfnxxxp6rq6chx1kb256w75jwfw"; }; - buildInputs = [ qt4 poppler_qt4 zlib ]; + buildInputs = [ qt4 poppler_qt4 zlib pkgconfig]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) " - qmake PREFIX=$out texstudio.pro + qmake PREFIX=$out NO_APPDATA=True texstudio.pro ''; meta = with stdenv.lib; { |