Updating hugin.
svn path=/nixpkgs/trunk/; revision=18915
This commit is contained in:
parent
362f811a7a
commit
a534f901bb
@ -1,22 +1,23 @@
|
||||
{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost,
|
||||
pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc }:
|
||||
pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut,
|
||||
glew, libXmu, libXi }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hugin-0.7.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hugin-2009.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/hugin/hugin-0.7.0.tar.gz;
|
||||
sha256 = "0nbrvzz94gqgk2v1900lly101g0wjz4zksnh5718226n2g8zlccf";
|
||||
url = "mirror://sourceforge/hugin/${name}.tar.gz";
|
||||
sha256 = "1z5hb1sfkpk6d1xnzqh8vy6rs7fhfjs5196pz98hwnx6wfi8w3k2";
|
||||
};
|
||||
|
||||
patches = [ ./levmar-64-bit-alignment.patch ];
|
||||
# patches = [ ./levmar-64-bit-alignment.patch ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
||||
|
||||
NIX_LDFLAGS = "-lrt";
|
||||
|
||||
buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig
|
||||
exiv2 gettext ilmbase ];
|
||||
exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
|
||||
|
||||
postInstall = ''
|
||||
ensureDir "$out/nix-support"
|
||||
|
@ -6926,8 +6926,10 @@ let
|
||||
|
||||
hugin = import ../applications/graphics/hugin {
|
||||
inherit fetchurl cmake panotools libtiff libpng boost pkgconfig
|
||||
exiv2 gettext ilmbase enblendenfuse autopanosiftc;
|
||||
exiv2 gettext ilmbase enblendenfuse autopanosiftc mesa freeglut
|
||||
glew;
|
||||
inherit wxGTK;
|
||||
inherit (xlibs) libXi libXmu;
|
||||
openexr = openexr_1_6_1;
|
||||
stdenv = overrideGCC stdenv gcc43_wrapper2;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user