Merge pull request #8393 from hrdinka/update/hugin

hugin: update 2013.0.0 -> 2015.0.0

+16 -15
+16 -15
pkgs/applications/graphics/hugin/default.nix
··· 1 - { stdenv, cmake, fetchurl, gnumake, pkgconfig 1 + { stdenv, cmake, fetchurl, gnumake, pkgconfig, makeWrapper 2 2 , boost, gettext, tclap, wxGTK 3 3 , freeglut, glew, libXi, libXmu, mesa 4 - , autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff 5 - , openexr, panotools, perlPackages 4 + , autopanosiftc, enblend-enfuse, exiv2, fftw, ilmbase, lensfun, libpng, libtiff 5 + , openexr, panotools, perlPackages, sqlite, vigra 6 6 }: 7 7 8 8 stdenv.mkDerivation rec { 9 - name = "hugin-2013.0.0"; 9 + name = "hugin-2015.0.0"; 10 10 11 11 src = fetchurl { 12 12 url = "mirror://sourceforge/hugin/${name}.tar.bz2"; 13 - sha256 = "1mgbvg09xvf0zcm9jfv5lb65nd292l86ffa23yp4pzm6izaiwkj8"; 13 + sha256 = "1gfblax9rxay8xskz5r8bips4nfh70vkyrb8ksgl6pg91c8krn9c"; 14 14 }; 15 15 16 16 NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; 17 17 18 18 buildInputs = [ boost gettext tclap wxGTK 19 19 freeglut glew libXi libXmu mesa 20 - exiv2 ilmbase lensfun libtiff libpng openexr panotools 20 + exiv2 fftw ilmbase lensfun libtiff libpng openexr panotools 21 + sqlite vigra 22 + perlPackages.ImageExifTool makeWrapper 21 23 ]; 22 24 23 25 # disable installation of the python scripting interface ··· 27 29 28 30 enableParallelBuilding = true; 29 31 30 - # commandline tools needed by the hugin batch processor 31 - # you may have to tell hugin (in the preferences) where these binaries reside 32 - propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake 33 - perlPackages.ImageExifTool 34 - ]; 35 - 36 32 postInstall = '' 37 - mkdir -p "$out/nix-support" 38 - echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages 33 + for p in $out/bin/*; do 34 + wrapProgram "$p" \ 35 + --suffix PATH : ${autopanosiftc}/bin \ 36 + --suffix PATH : ${enblend-enfuse}/bin \ 37 + --suffix PATH : ${gnumake}/bin \ 38 + --suffix PATH : ${perlPackages.ImageExifTool}/bin 39 + done 39 40 ''; 40 41 41 42 meta = { 42 43 homepage = http://hugin.sourceforge.net/; 43 44 description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; 44 45 license = stdenv.lib.licenses.gpl2Plus; 45 - maintainers = with stdenv.lib.maintainers; [viric]; 46 + maintainers = with stdenv.lib.maintainers; [ viric hrdinka ]; 46 47 platforms = with stdenv.lib.platforms; linux; 47 48 }; 48 49 }