about summary refs log tree commit diff
path: root/pkgs/tools/typesetting
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-05 09:14:08 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-05 09:14:08 +0100
commit51ef7c3e497ec09d4bc6b67c7e47e61c308454aa (patch)
treeb0fd889cc90b9fdc732df4f9c1c4a85419104b4f /pkgs/tools/typesetting
parent30fae2883e655c170e76d0827bcd9f396e9658af (diff)
parent1451a52a38f2dda459647a5c2628e7c28e17c4dc (diff)
downloadnixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar
nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.gz
nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.bz2
nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.lz
nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.xz
nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.tar.zst
nixlib-51ef7c3e497ec09d4bc6b67c7e47e61c308454aa.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r--pkgs/tools/typesetting/tex/texlive/bin.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 7c3b9d015db9..8fb155da7550 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -178,7 +178,7 @@ core = stdenv.mkDerivation rec {
   '' + cleanBrokenLinks;
 
   # needed for poppler and xpdf
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14";
 
   setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)
   passthru = { inherit version buildInputs; };