Merge pull request #15647 from layus/auctex

ktikz: init at 0.10

1 files changed, 19 insertions, 6 deletions

diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 6723526ff629..0d2282a4fd8f 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -1,10 +1,17 @@
-{ stdenv, fetchurl, emacs, texLive }:
+{ stdenv, fetchurl, emacs, texlive, ghostscript }:
  
-stdenv.mkDerivation ( rec {
-  pname = "auctex";
+let auctex = stdenv.mkDerivation ( rec {
   version = "11.89";
   name = "${pname}-${version}";
 
+  # Make this a valid tex(live-new) package;
+  # the pkgs attribute is provided with a hack below.
+  pname = "auctex";
+  tlType = "run";
+
+
+  outputs = [ "out" "tex" ];
+
   meta = {
     description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
     homepage = http://www.gnu.org/software/auctex;
@@ -15,10 +22,16 @@ stdenv.mkDerivation ( rec {
     sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq";
   };
 
-  buildInputs = [ emacs texLive ];
+  buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ];
+
+  preConfigure = ''
+    mkdir -p "$tex"
+  '';
 
   configureFlags = [
     "--with-lispdir=\${out}/share/emacs/site-lisp"
-    "--disable-preview"
+    "--with-texmf-dir=\${tex}"
   ];
-})
+});
+
+in auctex // { pkgs = [ auctex.tex ]; }