From 6ef4de22590476ddfd5984bdf2a804f934e13095 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 19 Apr 2010 19:41:38 +0000 Subject: [PATCH] Lyx update svn path=/nixpkgs/trunk/; revision=21170 --- pkgs/applications/misc/lyx/default.nix | 17 +++++++++++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index b047b8d3b08..2b646714706 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,15 +1,24 @@ # 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 { - version = "1.6.4"; + version = "1.6.5"; name = "lyx-${version}"; src = fetchurl { 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 = { description = "WYSIWYM frontend for LaTeX, DocBook, etc."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53860d05db3..46e68a7a7c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7579,7 +7579,8 @@ let }; lyx = import ../applications/misc/lyx { - inherit fetchurl stdenv texLive python; + inherit fetchurl stdenv texLive python makeWrapper; + inherit (xlibs) libX11; qt = qt4; };