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

Lyx update

Browse Source 
svn path=/nixpkgs/trunk/; revision=21170
This commit is contained in:
Marc Weber 2010-04-19 19:41:38 +00:00
parent d75d0cbb6a
commit 6ef4de2259
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,24 @@
# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc # I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
args: with args; { fetchurl, stdenv, texLive, python, makeWrapper
, libX11, qt
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6.4"; version = "1.6.5";
name = "lyx-${version}"; name = "lyx-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2"; url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2";
sha256 = "1b56e53e6884a9f1417811c03e5c986d79955444e8169244a2b80b0709223d15"; sha256 = "0xxj37l4ghaa2ij5nfxlg90rfw0znipigjlh271mfmwjw9ykcw1n";
}; };
buildInputs = [texLive qt python]; buildInputs = [texLive qt python makeWrapper ];
# don't ask me why it can't find libX11.so.6
postInstall = ''
wrapProgram $out/bin/lyx \
--prefix LD_LIBRARY_PATH ":" ${libX11}/lib
'';
meta = { meta = {
description = "WYSIWYM frontend for LaTeX, DocBook, etc."; description = "WYSIWYM frontend for LaTeX, DocBook, etc.";

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

@ -7579,7 +7579,8 @@ let
}; };
lyx = import ../applications/misc/lyx { lyx = import ../applications/misc/lyx {
inherit fetchurl stdenv texLive python; inherit fetchurl stdenv texLive python makeWrapper;
inherit (xlibs) libX11;
qt = qt4; qt = qt4;
}; };