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

Merge pull request #15288 from hrdinka/update/hugin

Browse Source 
hugin: 2015.0.0 -> 2016.0.0
This commit is contained in:
Arseniy Seroka 2016-05-08 13:46:17 +03:00
commit 25c1ff925f
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/graphics/hugin/default.nix
View File

@ -1,34 +1,32 @@
{ stdenv, cmake, fetchurl, gnumake, pkgconfig, makeWrapper { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig
, boost, gettext, tclap, wxGTK , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
, freeglut, glew, libX11, libXi, libXmu, mesa, cairo , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
, autopanosiftc, enblend-enfuse, exiv2, fftw, ilmbase, lensfun, libpng, libtiff , libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
, openexr, panotools, perlPackages, sqlite, vigra
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hugin-2015.0.0"; name = "hugin-2016.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2"; url = "mirror://sourceforge/hugin/${name}.tar.bz2";
sha256 = "1gfblax9rxay8xskz5r8bips4nfh70vkyrb8ksgl6pg91c8krn9c"; sha256 = "1rk5bgsvszv9bza46jxwr3i3qgiha2rza5v8lbwkqn4b4idv0c5h";
}; };
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; buildInputs = [
boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
buildInputs = [ boost gettext tclap wxGTK libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra
freeglut glew libX11 libXi libXmu mesa cairo wxGTK zlib
exiv2 fftw ilmbase lensfun libtiff libpng openexr panotools
sqlite vigra
perlPackages.ImageExifTool makeWrapper
]; ];
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
# disable installation of the python scripting interface # disable installation of the python scripting interface
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
postInstall = '' postInstall = ''
for p in $out/bin/*; do for p in $out/bin/*; do
wrapProgram "$p" \ wrapProgram "$p" \
@ -39,11 +37,11 @@ stdenv.mkDerivation rec {
done done
''; '';
meta = { meta = with stdenv.lib; {
homepage = http://hugin.sourceforge.net/; homepage = http://hugin.sourceforge.net/;
description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ viric hrdinka ]; maintainers = with maintainers; [ viric hrdinka ];
platforms = with stdenv.lib.platforms; linux; platforms = platforms.linux;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -12862,9 +12862,7 @@ in
fltk = fltk13; fltk = fltk13;
}; };
hugin = callPackage ../applications/graphics/hugin { hugin = callPackage ../applications/graphics/hugin { };
boost = boost155;
};
hydrogen = callPackage ../applications/audio/hydrogen { }; hydrogen = callPackage ../applications/audio/hydrogen { };