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

lyx: major update and some fixes

Browse Source
This commit is contained in:
Vladimír Čunát 2014-08-14 20:22:55 +02:00
parent 08b8eaae1c
commit c659c6ca80
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/misc/lyx/default.nix
View File

@ -1,14 +1,14 @@
{ fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig { fetchurl, stdenv, pkgconfig, python, file, bc
, libX11, qt4, enchant #, mythes, boost , qt4, hunspell, makeWrapper #, mythes, boost
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.0.7"; version = "2.1.1";
name = "lyx-${version}"; name = "lyx-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz";
sha256 = "0qp8xqmlafib4hispjgl1friln0w3s05mi20sjfzaxnl6jkvv5q5"; sha256 = "1fir1dzzy7c92jf3a3psnd10c6widslk0852xk4svpl6phcg4nya";
}; };
configureFlags = [ configureFlags = [
@ -18,18 +18,29 @@ stdenv.mkDerivation rec {
#"--without-included-mythes" # such a small library isn't worth a separate package #"--without-included-mythes" # such a small library isn't worth a separate package
]; ];
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
buildInputs = [ buildInputs = [
texLive qt4 python makeWrapper pkgconfig pkgconfig qt4 python file/*for libmagic*/ bc
enchant # mythes boost hunspell makeWrapper # enchant
]; ];
enableParallelBuilding = true;
doCheck = true; doCheck = true;
meta = { # python is run during runtime to do various tasks
postFixup = ''
sed '1s:/usr/bin/python:${python}/bin/python:'
wrapProgram "$out/bin/lyx" \
--prefix PATH : '${python}/bin'
'';
meta = with stdenv.lib; {
description = "WYSIWYM frontend for LaTeX, DocBook"; description = "WYSIWYM frontend for LaTeX, DocBook";
homepage = "http://www.lyx.org"; homepage = "http://www.lyx.org";
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.vcunat ]; maintainers = [ maintainers.vcunat ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }