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

Merge pull request #7714 from Chaddai/texmaker

Browse Source 
Texmaker and TeXStudio update
This commit is contained in:
Arseniy Seroka 2015-05-06 04:39:49 +03:00
commit dfaf86119e
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/texmaker/default.nix
View File

@ -2,20 +2,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "texmaker"; pname = "texmaker";
version = "4.1.1"; version = "4.4.1";
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 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z"; sha256 = "1d5lb4sibdhvzgfr0zi48j92b4acvvvdy2biqi3jzjdnzy9r94w0";
}; };
buildInputs = [ qt4 poppler_qt4 zlib ]; buildInputs = [ qt4 poppler_qt4 zlib ];
nativeBuildInputs = [ pkgconfig poppler ]; nativeBuildInputs = [ pkgconfig poppler ];
NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler";
preConfigure = '' 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 qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro
''; '';

11
pkgs/applications/editors/texstudio/default.nix
View File

@ -1,21 +1,20 @@
{ stdenv, fetchurl, qt4, poppler_qt4, zlib}: { stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "texstudio"; pname = "texstudio";
version = "2.7.0"; version = "2.9.4";
name = "${pname}-${version}"; name = "${pname}-${version}";
altname="Texstudio"; altname="Texstudio";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/texstudio/${name}.tar.gz"; url = "mirror://sourceforge/texstudio/${name}.tar.gz";
sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831"; sha256 = "1smmc4xqs8x8qzp6iqj2wr4xarfnxxxp6rq6chx1kb256w75jwfw";
}; };
buildInputs = [ qt4 poppler_qt4 zlib ]; buildInputs = [ qt4 poppler_qt4 zlib pkgconfig];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) " qmake PREFIX=$out NO_APPDATA=True texstudio.pro
qmake PREFIX=$out texstudio.pro
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {