diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
| commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
| tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/applications/misc/lyx/default.nix | |
| parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
| parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
| download | nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip | |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/applications/misc/lyx/default.nix')
| -rw-r--r-- | pkgs/applications/misc/lyx/default.nix | 17 |
1 files changed, 13 insertions, 4 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."; |