From 01e4d1a67f6062a6c59046dbc4461659ccff8031 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 16 Jun 2022 09:10:37 -0400 Subject: [PATCH] texlive.combined.basic-scheme: fix $PATH of wrapped scripts (#177826) Fix missing sed, grep and coreutils in $PATH. Closes: #150620 --- pkgs/tools/typesetting/tex/texlive/combine.nix | 2 +- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 8686502a1345..c18b7a011a86 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -180,7 +180,7 @@ in (buildEnv { echo -n "Wrapping '$link'" rm "$link" makeWrapper "$target" "$link" \ - --prefix PATH : "$out/bin:${perl}/bin" \ + --prefix PATH : "${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:$out/bin:${perl}/bin" \ --prefix PERL5LIB : "$PERL5LIB" \ --set-default TEXMFCNF "$TEXMFCNF" diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 0cdf0f397677..27db30593e88 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 -, makeWrapper, python3, ruby, perl +, makeWrapper, python3, ruby, perl, gnused, gnugrep, coreutils , useFixedHashes ? true , recurseIntoAttrs }: @@ -23,7 +23,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv lib makeWrapper writeText - stdenv python3 ruby perl; + stdenv python3 ruby perl gnused gnugrep coreutils; ghostscript = ghostscriptX; # could be without X, probably, but we use X above };