Merge pull request #158050 from risicle/ris-graphicsmagick-157920-fix

graphicsmagick: fix use of delegates in conversions

authored by Dmitry Kalinkin and committed by GitHub 04fc7d23 b964d23a

+15 -2
+15 -2
pkgs/applications/graphics/graphicsmagick/default.nix
··· 1 { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript 2 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 3 - , libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }: 4 5 stdenv.mkDerivation rec { 6 pname = "graphicsmagick"; ··· 33 # Remove CFLAGS from the binaries to avoid closure bloat. 34 # In the past we have had -dev packages in the closure of the binaries soley due to the string references. 35 postConfigure = '' 36 - nuke-refs ./magick/magick_config.h 37 ''; 38 39 postInstall = '' 40 sed -i 's/-ltiff.*'\'/\'/ $out/bin/* 41 ''; 42 43 meta = { 44 homepage = "http://www.graphicsmagick.org";
··· 1 { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript 2 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 3 + , libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences 4 + , runCommand 5 + , graphicsmagick # for passthru.tests 6 + }: 7 8 stdenv.mkDerivation rec { 9 pname = "graphicsmagick"; ··· 36 # Remove CFLAGS from the binaries to avoid closure bloat. 37 # In the past we have had -dev packages in the closure of the binaries soley due to the string references. 38 postConfigure = '' 39 + nuke-refs -e $out ./magick/magick_config.h 40 ''; 41 42 postInstall = '' 43 sed -i 's/-ltiff.*'\'/\'/ $out/bin/* 44 ''; 45 + 46 + passthru = { 47 + tests = { 48 + issue-157920 = runCommand "issue-157920-regression-test" { 49 + buildInputs = [ graphicsmagick ]; 50 + } '' 51 + gm convert ${graphviz}/share/graphviz/doc/pdf/neatoguide.pdf jpg:$out 52 + ''; 53 + }; 54 + }; 55 56 meta = { 57 homepage = "http://www.graphicsmagick.org";