From 72161f6810c9282d1bb3c2a6d8d676cbe80422c8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 15 Feb 2016 18:34:31 +0100 Subject: [PATCH] ragel: use new texlive infrastructure --- pkgs/development/tools/parsing/ragel/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 0b3844ef5e9..594ec7de53a 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra -, ghostscript, colm, build-manual ? false +{stdenv, fetchurl, transfig, tex , ghostscript, colm, build-manual ? false }: stdenv.mkDerivation rec { @@ -11,8 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs"; }; - buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript - (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ]; + buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ]; preConfigure = stdenv.lib.optional build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2b752ab5dc..c4b95ea44c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6062,7 +6062,9 @@ let }; - ragel = callPackage ../development/tools/parsing/ragel { }; + ragel = callPackage ../development/tools/parsing/ragel { + tex = texlive.combined.scheme-small; + }; hammer = callPackage ../development/tools/parsing/hammer { };