Merge pull request #57313 from delroth/gs-lcms2mt
ghostscript: link against "systemwide" liblcms2
This commit is contained in:
commit
c08f80839f
@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A software suite to create, edit, compose, or convert bitmap images";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ the-kenny ];
|
||||
broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
|
||||
, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
|
||||
, libiconv, ijs
|
||||
, libiconv, ijs, lcms2
|
||||
, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null
|
||||
, x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little
|
||||
}:
|
||||
@ -56,16 +56,15 @@ stdenv.mkDerivation rec {
|
||||
buildInputs =
|
||||
[ zlib expat openssl
|
||||
libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec
|
||||
libiconv ijs
|
||||
libiconv ijs lcms2
|
||||
]
|
||||
++ lib.optional x11Support xlibsWrapper
|
||||
++ lib.optional cupsSupport cups
|
||||
;
|
||||
# No lcms2; upstream "is in process of forking it" and thus won't use one from a library.
|
||||
|
||||
preConfigure = ''
|
||||
# requires in-tree (heavily patched) openjpeg
|
||||
rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec freetype cups/libs ijs
|
||||
rm -rf jpeg libpng zlib jasper expat tiff lcms2mt jbig2dec freetype cups/libs ijs
|
||||
|
||||
sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak
|
||||
sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac
|
||||
|
Loading…
Reference in New Issue
Block a user