From 830ec779587620fcfb2c577a7810ad77ac02832e Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 28 Aug 2023 18:27:22 +0100 Subject: [PATCH] texlive.bin: drop cleanBrokenLinks --- pkgs/tools/typesetting/tex/texlive/bin.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 4ec3cadd870d..31720ae8022e 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -84,20 +84,12 @@ let ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILDCC=${buildPackages.stdenv.cc.targetPrefix}cc"; - # clean broken links to stuff not built - cleanBrokenLinks = '' - for f in "$out"/bin/*; do - if [[ ! -x "$f" ]]; then rm "$f"; fi - done - ''; - # move binaries to corresponding split outputs, based on content of texlive.tlpdb binToOutput = lib.listToAttrs (lib.concatMap (n: map (v: { name = v; value = builtins.replaceStrings [ "-" ] [ "_" ] n; }) binPackages.${n}.binfiles or [ ]) (builtins.attrNames binPackages)); - # (must be run after cleanBrokenLinks) moveBins = '' for bin in "$out/bin"/* ; do bin="''${bin##*/}" @@ -120,7 +112,6 @@ let withLuaJIT = !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV; in rec { # un-indented -inherit (common) cleanBrokenLinks; texliveYear = year; @@ -198,7 +189,7 @@ core = stdenv.mkDerivation rec { '' + /* install himktables in separate output for use in cross compilation */ '' mkdir -p $dev/bin cp texk/web2c/.libs/himktables $dev/bin/himktables - '' + cleanBrokenLinks + common.moveBins; + '' + common.moveBins; setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) passthru = { inherit version buildInputs; };