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

Updating hugin.

Browse Source 
svn path=/nixpkgs/trunk/; revision=18915
This commit is contained in:
Lluís Batlle i Rossell 2009-12-12 18:58:40 +00:00
parent 362f811a7a
commit a534f901bb
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,23 @@
{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, {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 { stdenv.mkDerivation rec {
name = "hugin-0.7.0"; name = "hugin-2009.2.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/hugin/hugin-0.7.0.tar.gz; url = "mirror://sourceforge/hugin/${name}.tar.gz";
sha256 = "0nbrvzz94gqgk2v1900lly101g0wjz4zksnh5718226n2g8zlccf"; sha256 = "1z5hb1sfkpk6d1xnzqh8vy6rs7fhfjs5196pz98hwnx6wfi8w3k2";
}; };
patches = [ ./levmar-64-bit-alignment.patch ]; # patches = [ ./levmar-64-bit-alignment.patch ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
NIX_LDFLAGS = "-lrt"; NIX_LDFLAGS = "-lrt";
buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig
exiv2 gettext ilmbase ]; exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
postInstall = '' postInstall = ''
ensureDir "$out/nix-support" ensureDir "$out/nix-support"

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

@ -6926,8 +6926,10 @@ let
hugin = import ../applications/graphics/hugin { hugin = import ../applications/graphics/hugin {
inherit fetchurl cmake panotools libtiff libpng boost pkgconfig inherit fetchurl cmake panotools libtiff libpng boost pkgconfig
exiv2 gettext ilmbase enblendenfuse autopanosiftc; exiv2 gettext ilmbase enblendenfuse autopanosiftc mesa freeglut
glew;
inherit wxGTK; inherit wxGTK;
inherit (xlibs) libXi libXmu;
openexr = openexr_1_6_1; openexr = openexr_1_6_1;
stdenv = overrideGCC stdenv gcc43_wrapper2; stdenv = overrideGCC stdenv gcc43_wrapper2;
}; };