colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texlive.bin.xdvi: pull upstream darwin fix for -fno-common toolchains

Browse Source 
Without the change build fails on upstream llvm-11 as:

    duplicate symbol '_info' in:
        libxdvi.a(font-open.o)
        libxdvi.a(print-log.o)
This commit is contained in:
Sergei Trofimovich 2022-07-02 20:48:31 +01:00
parent 8135380d16
commit 58e2a18480
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl
{ lib, stdenv, fetchurl, fetchpatch
, texlive
, zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
@ -25,6 +25,15 @@ let
];
sha256 = "0jsq1p66l46k2qq0gbqmx25flj2nprsz4wrd1ybn286p11kdkvvs";
};
patches = [
# Pull upstream fix for -fno-common toolchains.
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/TeX-Live/texlive-source/commit/7748582aeda70ffa02105f6e3e2fc2476e76aac6.patch";
sha256 = "1y59cwa41kbg0i071g488jhi9qg0h8l7hqd69brhx2yj95za8c40";
excludes = [ "texk/xdvik/ChangeLog" ];
})
];
prePatch = ''
for i in texk/kpathsea/mktex*; do
@ -406,7 +415,7 @@ xdvi = stdenv.mkDerivation {
pname = "texlive-xdvi.bin";
inherit version;
inherit (common) src;
inherit (common) src patches;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ core/*kpathsea*/ freetype ghostscript ]