gnu: Add missing (gnu packages xdisorg) import.

[jackhill/guix/guix.git] / gnu / packages / texlive.scm

diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index 3b36ad2..02637be 100644 (file)
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -33,9 +33,10 @@
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages which)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages ruby)
   #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages which)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages zip)
   #:autoload   (gnu packages texinfo) (texinfo))
@@ -68,28 +69,29 @@
              ("texlive-texmf-src" ,texlive-texmf-src)
              ("cairo" ,cairo)
              ("fontconfig" ,fontconfig)
+             ("fontforge" ,fontforge)
              ("freetype" ,freetype)
              ("gd" ,gd)
              ("ghostscript" ,ghostscript)
              ("graphite2" ,graphite2)
              ("harfbuzz" ,harfbuzz)
              ("icu4c" ,icu4c)
+             ("libpaper" ,libpaper)
              ("libpng" ,libpng)
              ("libxaw" ,libxaw)
              ("libxt" ,libxt)
+             ("perl" ,perl)
              ("pixman" ,pixman)
              ("poppler" ,poppler)
-             ;; FIXME: Add interpreters fontforge and ruby,
-             ;; once they are available.
+             ("potrace" ,potrace)
+             ("python" ,python-2) ; incompatible with Python 3 (print syntax)
+             ("ruby" ,ruby)
+             ("tcsh" ,tcsh)
              ("teckit" ,teckit)
-             ("t1lib" ,t1lib)
              ("zlib" ,zlib)
              ("zziplib" ,zziplib)))
    (native-inputs
-    `(("perl" ,perl)
-      ("pkg-config" ,pkg-config)
-      ("python" ,python-2) ; incompatible with Python 3 (print syntax)
-      ("tcsh" ,tcsh)))
+    `(("pkg-config" ,pkg-config)))
    (outputs '("out" "data"))
    (arguments
     `(#:out-of-source? #t
@@ -108,10 +110,11 @@
          "--with-system-harfbuzz"
          "--with-system-icu"
          "--with-system-libgs"
+         "--with-system-libpaper"
          "--with-system-libpng"
          "--with-system-pixman"
          "--with-system-poppler"
-         "--with-system-t1lib"
+         "--with-system-potrace"
          "--with-system-teckit"
          "--with-system-xpdf"
          "--with-system-zlib"