From a88ead56190bfd0366af2e6d300f7fc9026a4b61 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 18 Mar 2021 10:29:52 +0100 Subject: [PATCH 1/2] perlPackages.PerlMagick: enable HDRI support ... to match the native ImageMagick 7 defaults. --- pkgs/top-level/perl-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ebf7b03a11d..b8ae880c67f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16756,6 +16756,11 @@ let preConfigure = '' sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL + + # Enable HDRI support to match the native ImageMagick 7 defaults + # See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538 + substituteInPlace Makefile.PL \ + --replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1' ''; }; From 26706450169e291ba88d181b8010a7c3487211cd Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 18 Mar 2021 10:30:32 +0100 Subject: [PATCH 2/2] Revert "perlPackages.Gtk3ImageView: disable tests" a88ead5 fixes the test failures for this package. This reverts commit 147359ee16670fd2d22236ac93044c57f181a027. --- pkgs/top-level/perl-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b8ae880c67f..e396a510dbc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9143,10 +9143,6 @@ let }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ]; - # Tests are broken with PerlMagick and imagemagick version 7 as of 2021-02-22. - # See https://github.com/carygravel/gtk3-imageview/issues/19 and - # https://github.com/NixOS/nixpkgs/pull/114007#issuecomment-783595659. - doCheck = false; checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkPhase = '' ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \