Fixing the hugin build, and its meta information, with help of civodul.

svn path=/nixpkgs/trunk/; revision=14899

1 files changed, 17 insertions, 3 deletions

diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 1b96e552f31c..9f74f1702fce 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -15,16 +15,30 @@ stdenv.mkDerivation {
   # I added these flags to get all the rpaths right, which I guess they are
   # taken from the qt4 sources. Not very nice.
   cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
+    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" +
+    " -lpng12 -lpano13 -lImath -lIlmImf -lIex -lHalf -lIlmThread" +
+    " -ljpeg -ltiff -lz -lexiv2 -lboost_thread-mt\"" +
     " -DCMAKE_SKIP_BUILD_RPATH=ON" +
     " -DCMAKE_BUILD_TYPE=Release" +
     " -DCMAKE_INSTALL_PREFIX=$out";
 
-  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ];
+  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ilmbase ];
+
+  dontUseCmakeConfigure = true;
+
+  # I rewrote the configure phase to get the $out references evaluated in
+  # cmakeFlags
+  configurePhase = ''
+    set -x
+    mkdir -p build;
+    cd build
+    eval -- "cmake .. $cmakeFlags"
+    set +x
+    '';
 
   meta = {
     homepage = http://hugin.sourceforge.net/;
-    description = "Panoramic imaging toolchain";
+    description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
     license = "GPLv2+";
   };
 }