diff options
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/djvu2pdf/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/typesetting/hevea/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive-new/bin.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive-new/default.nix | 4 |
4 files changed, 36 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index 5455df5f106..512efe497fa 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, djvulibre, ghostscript }: +{ stdenv, makeWrapper, fetchurl, djvulibre, ghostscript, which }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -9,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g"; }; - buildInputs = [ pkgconfig ]; - propagatedUserEnvPkgs = [ djvulibre ghostscript ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre}/bin:${which}/bin + mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 ''; @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { description = "Creates djvu files from PDF files"; homepage = http://0x2a.at/s/projects/djvu2pdf; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; inherit version; }; } diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 0626ec84fbe..3343579bbab 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "hevea-2.25"; + name = "hevea-2.26"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "0kn99v92xsfy12r9gfvwgs0xf3s9s6frfg86a8q6damj1dampiz4"; + sha256 = "173v6z2li12pah6315dfpwhqrdljkhsff82gj7sql812zwjkvd2f"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive-new/bin.nix index 7ed9b58d14d..f833cc2f82b 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/bin.nix @@ -8,6 +8,8 @@ , makeWrapper }: +# Useful resource covering build options: +# http://tug.org/texlive/doc/tlbuild.html let withSystemLibs = map (libname: "--with-system-${libname}"); @@ -222,5 +224,28 @@ bibtex8 = stdenv.mkDerivation { }; +xdvi = stdenv.mkDerivation { + name = "texlive-xdvi.bin-${version}"; + + inherit (common) src; + + buildInputs = [ pkgconfig core/*kpathsea*/ freetype ghostscript ] + ++ (with xorg; [ libX11 libXaw libXi libXpm libXmu libXaw libXext libXfixes ]); + + preConfigure = "cd texk/xdvik"; + + configureFlags = common.configureFlags + ++ [ "--with-system-kpathsea" "--with-system-libgs" ]; + + enableParallelBuilding = true; + + postInstall = '' + substituteInPlace "$out/bin/xdvi" \ + --replace "exec xdvi-xaw" "exec '$out/bin/xdvi-xaw'" + ''; + # TODO: it's suspicious that mktexpk generates fonts into ~/.texlive2014 +}; + + } # un-indented diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index a084c973b78..5fe52ba07ba 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -84,6 +84,10 @@ let latex = orig.latex // { deps = removeAttrs orig.latex.deps [ "luatex" ]; }; + + xdvi = orig.xdvi // { # it seems to need it to transform fonts + deps = (orig.xdvi.deps or {}) // { inherit (tl) metafont; }; + }; }; # overrides # tl = |