public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
This commit is contained in:
Eelco Dolstra
2015-10-06 15:24:20 +02:00
parent fe195af944
commit 741bf840da
53 changed files with 385 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/enblend-enfuse/default.nix
+4 -6
View File
@@ -1,24 +1,22 @@
{ stdenv, fetchurl
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra
, help2man, pkgconfig, perl }:
, pkgconfig, perl }:
let version = "4.1.4"; in
stdenv.mkDerivation rec {
name = "enblend-enfuse-${version}";
name = "enblend-enfuse-4.1.3";
src = fetchurl {
url = "mirror://sourceforge/enblend/${name}.tar.gz";
sha256 = "0208x01i129hqylmy6jh3krwdac47mx6fi8xccjm9h35c18c7xl5";
sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w";
};
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ];
nativeBuildInputs = [ help2man perl pkgconfig ];
nativeBuildInputs = [ 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;