From 07fd56678032ee190267f138251c77627c4671f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Jul 2011 09:29:57 +0000 Subject: [PATCH] perl-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=27668 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 89c4cd64875c..36d470f70668 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1277,7 +1277,7 @@ rec { sha256 = "1p84585b4iyqa21hbqni0blj8fzd917ynd3y1hwh3mrmyfqj178x"; }; - buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype + buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetOptLong ]; # Patch needed to get arguments past the first GetOptions call @@ -1290,7 +1290,7 @@ rec { # ( although the images look the same to my eye ); this is # possibly because the source packaged image was generated with a # different version of some library ( libpng maybe? ). - postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t"; + postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t"; makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; }; @@ -2081,7 +2081,7 @@ rec { sha256 = "179cxwqxb0f9dpx8954nvwjmggxxi5ndnang41yav1dx6mf0abp7"; }; }; - + ParamsUtil = buildPerlPackage rec { name = "Params-Util-1.01"; src = fetchurl {