Merge pull request #266569 from wegank/dvisvgm-clang-16

texlive.dvisvgm.pkgs: fix build with clang 16
This commit is contained in:
Weijia Wang 2023-11-10 07:55:15 +01:00 committed by GitHub
commit b5d130f624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions

View File

@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
hash = "sha256-DL5DyfARHHbwWBVHSa/VwHzNaAx/v7EDdnw1GLOk+y0=";
};
postPatch = lib.optionalString stdenv.cc.isClang ''
substituteInPlace makefile \
--replace "\$(CXX)" "\$(CXX) -std=c++98"
'';
outputs = [ "out" "doc" ];
nativeBuildInputs = [ texliveFull ]; # scheme-full needed for ucs package

View File

@ -310,12 +310,21 @@ chktex = stdenv.mkDerivation {
};
dvisvgm = stdenv.mkDerivation rec {
dvisvgm = stdenv.mkDerivation {
pname = "texlive-dvisvgm.bin";
inherit version;
inherit (common) src;
patches = [
(fetchpatch {
url = "https://github.com/mgieseki/dvisvgm/commit/629544928877362d0c6d64f20695f7df3073c5eb.patch";
stripLen = 1;
extraPrefix = "texk/dvisvgm/dvisvgm-src/";
hash = "sha256-CBCbc/woaFeLw7aBG/kSVYc3a5Q56zbAB64kK6mRy4g=";
})
];
preConfigure = "cd texk/dvisvgm";
configureFlags = common.configureFlags