Hello, I am currently working a bit on texlive with the goal of simplifying the recipe and disentangling its two outputs.
This first patch drops texlive-extra-src. We use it only to install its subdirectory tlpkg, which contains perl files for tlmgr, which we do not need. According to https://www.tug.org/texlive/distro.html : "System distributions all have their own packaging systems, so tlmgr is not used for TeX-related package updates by any distro that we know of." Notice that tlmgr does not work currently either, as it does not find the perl include files from tlpkg anyway: $ tlmgr Can't locate TeXLive/TLConfig.pm in @INC (@INC contains: /gnu/store/texmf-dist/scripts/texlive /gnu/store/tlpkg /home/enge/.guix-profile/lib/perl5/site_perl/5.16.1/x86_64-linux ... Currently I am trying the build; okay to push if the build succeeds? Andreas * gnu/packages/texlive.scm (texlive-extra-src): Drop variable. * gnu/packages/texlive.scm (texlive): Drop input texlive-extra-src; it is only useful for tlmgr, which is not used in distribution-wide installations. --- gnu/packages/texlive.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm index f14bbb8..720fa31 100644 --- a/gnu/packages/texlive.scm +++ b/gnu/packages/texlive.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Andreas Enge <[email protected]> +;;; Copyright © 2013, 2014, 2015 Andreas Enge <[email protected]> ;;; Copyright © 2014 Eric Bavier <[email protected]> ;;; ;;; This file is part of GNU Guix. @@ -42,13 +42,6 @@ #:use-module (gnu packages zip) #:autoload (gnu packages texinfo) (texinfo)) -(define texlive-extra-src - (origin - (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-extra.tar.xz";) - (sha256 (base32 - "1zlnjysvxskcy05iva6jfklirwv12wqyn3ia119a7xnqlvhpqz33")))) - (define texlive-texmf-src (origin (method url-fetch) @@ -66,8 +59,7 @@ (sha256 (base32 "1glmaw2jv42grbsn05kay825j66scimjqqc32776bb1356q4xfq8")))) (build-system gnu-build-system) - (inputs `(("texlive-extra-src" ,texlive-extra-src) - ("texlive-texmf-src" ,texlive-texmf-src) + (inputs `(("texlive-texmf-src" ,texlive-texmf-src) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("fontforge" ,fontforge) @@ -147,13 +139,6 @@ ;; Delete texmf-dist from "data", since it will be reinstalled ;; from texlive-texmf. (system* "rm" "-r" (string-append data "/texmf-dist")) - ;; Unpack texlive-extra and install tlpkg. - (mkdir "texlive-extra") - (with-directory-excursion "texlive-extra" - (apply unpack (list #:source texlive-extra)) - (apply patch-source-shebangs (list #:source texlive-extra)) - (system* "mv" "tlpkg" data) - (chdir "..")) ;; Unpack and install texlive-texmf. (mkdir "texlive-texmf") (with-directory-excursion "texlive-texmf" -- 2.2.1
