From 128bb7be2a97e3e5c5b5e1295a17323fb7d34587 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 11 Mar 2019 00:07:18 +0100 Subject: [PATCH 1/2] ghostscript: link against "systemwide" liblcms2 GS ships with a fork of lcms2 ("lcms2mt"), but the ABI separation between the fork and the original seems insufficient. If libgs is linked alongside liblcms2 (for example, this is the case with imagemagick) then it will call into the original library instead of the fork, causing segfaults. Follow the example of both Arch and Debian in this regard -- they both use the systemwide lib instead of the fork. --- pkgs/misc/ghostscript/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index cd944a6788f..10481c21785 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -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 From a9cf5c27ec95b30e36c863b766b28d8de30cb19d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 11 Mar 2019 00:13:02 +0100 Subject: [PATCH 2/2] imagemagickBig: revert meta.broken to false --- pkgs/applications/graphics/ImageMagick/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7981403eb75..b3a1b64cae9 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -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; }; }