diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
| commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
| tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/tools/graphics/enblend-enfuse | |
| parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) | |
| download | nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.gz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2 nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.lz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.xz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.zst nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.zip | |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
Diffstat (limited to 'pkgs/tools/graphics/enblend-enfuse')
| -rw-r--r-- | pkgs/tools/graphics/enblend-enfuse/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index c967b73001c..6b65d3df0d3 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -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; |