From ce82a2d6d91f3e9d7472eac047d9b34c8e557be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= Date: Wed, 23 Apr 2014 12:09:25 +0200 Subject: [PATCH] Cleaning up the description and fixing qt to qt4 --- pkgs/applications/editors/texstudio/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 20e8e4bba3e..01f290d9df8 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b63567029ea..725a3452b57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };