From a608a6f52a6d7021a802a3e9344a2f66815fadeb Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sat, 12 Jul 2014 13:17:53 +0200 Subject: enblend-enfuse: update to version 4.1.3 --- pkgs/tools/graphics/enblend-enfuse/default.nix | 27 ++++++-------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index b77d63d510df..bfb01ead3028 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,34 +1,19 @@ -{stdenv, fetchurl, libtiff, libpng, lcms, libxmi, boost, mesa, freeglut -, pkgconfig, perl, glew }: +{ stdenv, fetchurl +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra +, pkgconfig, perl }: stdenv.mkDerivation rec { - name = "enblend-enfuse-4.0"; + name = "enblend-enfuse-4.1.3"; src = fetchurl { url = "mirror://sourceforge/enblend/${name}.tar.gz"; - sha256 = "1i2kq842zrncpadarhcikg447abmh5r7a5js3mzg553ql3148am1"; + sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w"; }; - buildInputs = [ libtiff libpng lcms libxmi boost mesa freeglut glew ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; nativeBuildInputs = [ perl pkgconfig ]; - patches = - let - prefix = "http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/raw-diff"; - in map fetchurl [ - { - url = "${prefix}/9d9b5f3a97cd/src/vigra_impex/png.cxx"; - name = "ftbfs-libpng15.patch"; - sha256 = "1nqhbbgphwi087qpazngg04c1whc1p4fwq19fx36jrir96xywgzg"; - } - { - url = "${prefix}/101796703d73/src/vigra_impex/png.cxx"; - name = "ftbfs-libpng15.patch"; - sha256 = "14frqg4hab9ab6pdypkrmji43fmxjj918j7565rdwmifbm9i3005"; - } - ]; - meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; -- cgit 1.4.1