Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
This commit is contained in:
William A. Kennington III
2015-11-14 12:32:51 -08:00
parent e4feccce81
commit 6602f49495
42 changed files with 579 additions and 140 deletions
@@ -1,22 +1,24 @@
{ stdenv, fetchurl
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra
, pkgconfig, perl }:
, help2man, pkgconfig, perl }:
let version = "4.1.4"; in
stdenv.mkDerivation rec {
name = "enblend-enfuse-4.1.3";
name = "enblend-enfuse-${version}";
src = fetchurl {
url = "mirror://sourceforge/enblend/${name}.tar.gz";
sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w";
sha256 = "0208x01i129hqylmy6jh3krwdac47mx6fi8xccjm9h35c18c7xl5";
};
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ];
nativeBuildInputs = [ perl pkgconfig ];
nativeBuildInputs = [ help2man perl pkgconfig ];
enableParallelBuilding = true;
meta = {
inherit version;
homepage = http://enblend.sourceforge.net/;
description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
license = stdenv.lib.licenses.gpl2;