Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f226459a39fc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c08f80839fc2
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 10, 2019

  1. 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.
    @delroth
    delroth committed Mar 10, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    128bb7b View commit details

  2. imagemagickBig: revert meta.broken to false

    @delroth
    delroth committed Mar 10, 2019
    Copy the full SHA
    a9cf5c2 View commit details

Commits on Mar 11, 2019

  1. Merge pull request #57313 from delroth/gs-lcms2mt 

    ghostscript: link against "systemwide" liblcms2
    @Mic92
    Mic92 authored Mar 11, 2019
    Copy the full SHA
    c08f808 View commit details
Showing with 3 additions and 5 deletions.
  1. +0 −1 pkgs/applications/graphics/ImageMagick/default.nix
  2. +3 −4 pkgs/misc/ghostscript/default.nix
1 change: 0 additions & 1 deletion pkgs/applications/graphics/ImageMagick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
7 changes: 3 additions & 4 deletions pkgs/misc/ghostscript/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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