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

Merge pull request #57313 from delroth/gs-lcms2mt

Browse Source 
ghostscript: link against "systemwide" liblcms2
This commit is contained in:
Jörg Thalheim 2019-03-11 10:29:57 +00:00 committed by GitHub
commit c08f80839f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
description = "A software suite to create, edit, compose, or convert bitmap images"; description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ the-kenny ]; maintainers = with maintainers; [ the-kenny ];
broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118
license = licenses.asl20; license = licenses.asl20;
}; };
} }

7
pkgs/misc/ghostscript/default.nix
View File

@ -1,6 +1,6 @@
{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf { config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
, libiconv, ijs , libiconv, ijs, lcms2
, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null
, x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little
}: }:
@ -56,16 +56,15 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib expat openssl [ zlib expat openssl
libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec
libiconv ijs libiconv ijs lcms2
] ]
++ lib.optional x11Support xlibsWrapper ++ lib.optional x11Support xlibsWrapper
++ lib.optional cupsSupport cups ++ lib.optional cupsSupport cups
; ;
# No lcms2; upstream "is in process of forking it" and thus won't use one from a library.
preConfigure = '' preConfigure = ''
# requires in-tree (heavily patched) openjpeg # 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@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 sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac