texlive: provide bin.texlive on Darwin too

texlive attribute was accidentally added in attrset wrapped with

  stdenv.lib.optionalAttrs (!stdenv.isDarwin)

Fixes: dbc2c1c4b8 ('texlive: add missing perl dependencies for latexindent')
This commit is contained in:
Dmitry Kalinkin 2019-05-03 10:25:17 -04:00
parent a01943c7f0
commit b6d0bdf513
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 27 additions and 26 deletions

View File

@ -284,6 +284,33 @@ dvipng = stdenv.mkDerivation {
};
latexindent = perlPackages.buildPerlPackage rec {
inherit (src) name version;
src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs);
outputs = [ "out" ];
propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ];
postPatch = ''
substituteInPlace scripts/latexindent/LatexIndent/GetYamlSettings.pm \
--replace '$FindBin::RealBin/defaultSettings.yaml' ${src}/scripts/latexindent/defaultSettings.yaml
'';
# Dirty hack to apply perlFlags, but do no build
preConfigure = ''
touch Makefile.PL
'';
buildPhase = ":";
installPhase = ''
install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent
mkdir -p "$out"/${perl.libPrefix}
cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/
'';
};
inherit biber;
bibtexu = bibtex8;
bibtex8 = stdenv.mkDerivation {
@ -364,30 +391,4 @@ xindy = stdenv.mkDerivation {
'';
};
latexindent = perlPackages.buildPerlPackage rec {
inherit (src) name version;
src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs);
outputs = [ "out" ];
propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ];
postPatch = ''
substituteInPlace scripts/latexindent/LatexIndent/GetYamlSettings.pm \
--replace '$FindBin::RealBin/defaultSettings.yaml' ${src}/scripts/latexindent/defaultSettings.yaml
'';
# Dirty hack to apply perlFlags, but do no build
preConfigure = ''
touch Makefile.PL
'';
buildPhase = ":";
installPhase = ''
install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent
mkdir -p "$out"/${perl.libPrefix}
cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/
'';
};
}