Guest User

Untitled

a guest
Oct 20th, 2017
101
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.59 KB | None | 0 0
  1. $ git diff pkgs/tools/typesetting/tex/texlive/bin.nix
  2. diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
  3. index 34a689ee9bd..45c63ebb584 100644
  4. --- a/pkgs/tools/typesetting/tex/texlive/bin.nix
  5. +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
  6. @@ -176,6 +176,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
  7. (
  8. if [[ "$path" == "libs/lua52" ]]; then
  9. extraConfig="--enable-static --disable-shared"
  10. + elif [[ "$path" == "texk/web2c" ]]; then
  11. + extraConfig="CXXFLAGS=-std=c++11"
  12. else
  13. extraConfig=""
  14. fi
  15. @@ -186,6 +188,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
  16. done
  17. '';
  18.  
  19. + patches = [ ./c++11.patch ];
  20. preBuild = "cd texk/web2c";
  21. enableParallelBuilding = true;
  22.  
  23. $ cat pkgs/tools/typesetting/tex/texlive/c++11.patch
  24. diff -u -r ../texlive-20160523-source/texk/web2c/luatexdir/image/pdftoepdf.w ./texk/web2c/luatexdir/image/pdftoepdf.w
  25. --- ../texlive-20160523-source/texk/web2c/luatexdir/image/pdftoepdf.w 2016-03-25 12:44:48.000000000 +0000
  26. +++ ./texk/web2c/luatexdir/image/pdftoepdf.w 2017-04-21 23:48:03.787934684 +0000
  27. @@ -71,7 +72,12 @@
  28. ck = (char *) malloc(PDF_CHECKSUM_SIZE);
  29. if (ck == NULL)
  30. formatted_error("pdf inclusion","out of memory while processing '%s'", a);
  31. - snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t) size,(uint64_t) mtime);
  32. + snprintf(ck, PDF_CHECKSUM_SIZE, "%"
  33. + PRIu64
  34. + "_%"
  35. + PRIu64,
  36. + (uint64_t) size,
  37. + (uint64_t) mtime);
  38. } else {
  39. switch (fe) {
  40. case FE_FAIL:
Add Comment
Please, Sign In to add comment