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

Cleaning up the description and fixing qt to qt4

Browse Source
This commit is contained in:
Chaddaï Fouché 2014-04-23 12:09:25 +02:00
parent ed3a809a3d
commit ce82a2d6d9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt, popplerQt4, zlib}:
{ stdenv, fetchurl, qt4, popplerQt4, zlib}:
stdenv.mkDerivation rec {
pname = "texstudio";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
};
buildInputs = [ qt popplerQt4 zlib ];
buildInputs = [ qt4 popplerQt4 zlib ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) "
@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Fork of TeXMaker, this editor is a full fledged IDE for LaTeX editing with completion, structure viewer, preview and support of any compilation chain.";
description = "TeX and LaTeX editor";
longDescription=''
Fork of TeXMaker, this editor is a full fledged IDE for
LaTeX editing with completion, structure viewer, preview,
spell checking and support of any compilation chain.
'';
homepage = "http://texstudio.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.linux;

2
pkgs/top-level/all-packages.nix
View File

@ -2059,7 +2059,7 @@ let
texmaker = callPackage ../applications/editors/texmaker { };
texstudio = callPackage ../applications/editors/texstudio { qt = qt4; };
texstudio = callPackage ../applications/editors/texstudio { };
tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };