From 7dcc3072416be103aca28dfa8d7e07d51744400f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 1 Jan 2018 09:47:39 +0100 Subject: [PATCH] texlive: use perl 5.24 See #26890. --- pkgs/tools/typesetting/tex/texlive/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 38642b815f8..a6b1ac6c9f4 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, perl522, python, ruby +, makeWrapper, python, ruby, perl , useFixedHashes ? true , recurseIntoAttrs }: @@ -28,8 +28,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv fastUnique lib makeWrapper writeText - stdenv python ruby; - perl = perl522; # avoid issues like #26890, probably remove after texlive upgrade + stdenv python ruby perl; ghostscript = ghostscriptX; # could be without X, probably, but we use X above };