Merge master into staging-next

2021-03-19 06:17:55 +00:00
parent d73a492e83 e35acbb6d8
commit 6ffd2fe000
12 changed files with 288 additions and 76 deletions
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -281,12 +281,9 @@ dvipng = stdenv.mkDerivation {
  configureFlags = common.configureFlags
    ++ [ "--with-system-kpathsea" "--with-gs=yes" "--disable-debug" ];

-  enableParallelBuilding = true;
+  GS="${ghostscript}/bin/gs";

-  # I didn't manage to hardcode gs location by configureFlags
-  postInstall = ''
-    wrapProgram "$out/bin/dvipng" --prefix PATH : '${ghostscript}/bin'
-  '';
+  enableParallelBuilding = true;
 };