From f9c551a41f111ab7608464da90649021e669f7cb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 10 Feb 2012 10:13:39 +0000 Subject: hugin-2011.4.0 svn path=/nixpkgs/trunk/; revision=32170 --- pkgs/applications/graphics/hugin/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/graphics/hugin') diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 795417dbf5b3..27b3c0c9b032 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,25 +1,29 @@ -{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, - pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut, - glew, libXmu, libXi }: +{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost +, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa +, freeglut, glew, libXmu, libXi, tclap }: stdenv.mkDerivation rec { - name = "hugin-2010.4.0"; + name = "hugin-2011.4.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "13n3p4f39mbdydsjqy48csjgvv30lfcwvln5y5dyy95lyrfwcp6l"; + sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - NIX_LDFLAGS = "-lrt"; +#NIX_LDFLAGS = "-lrt"; - buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig + buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; + buildNativeInputs = [ cmake pkgconfig ]; + + propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ]; + postInstall = '' - ensureDir "$out/nix-support" - echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages + mkdir -p "$out/nix-support" + echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages ''; meta = { -- cgit 1.4.1