From 524d9b656e1c72d3fdeebeb674f0c494f9fc8ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Feb 2013 01:09:56 +0100
Subject: [PATCH] WIP

---
 .../science/misc/vite/default.nix             | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  6 +++++
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 4c1cf318b5a2..db199ccfad6c 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -1,31 +1,28 @@
-{ fetchsvn, stdenv, cmake, qt4, mesa }:
+{ stdenv, fetchurl, fetchsvn, cmake, qt4, mesa, opentrace_format, libtau }:
 
 # ViTE 1.1 has several bugs, so use the SVN version.
 let
-  rev = "1143";
+  rev = "1157";
   externals = fetchsvn {
     url = "svn://scm.gforge.inria.fr/svn/vite/externals";
-    sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a";
+    sha256 = "1yqx72q3dd53k8z6jz93nbm9yyysq4npdjh1qv3f1qcrpz75k1zj";
     inherit rev;
   };
 in
 stdenv.mkDerivation {
-  name = "vite-1.2pre${rev}";
+  name = "vite-1.2";
 
-  src = fetchsvn {
-    url = "svn://scm.gforge.inria.fr/svn/vite/trunk";
-    sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4";
-    inherit rev;
+  src = fetchurl {
+    url = "http://gforge.inria.fr/frs/download.php/27457/vite_${rev}.tar.gz";
+    sha256 = "0j894wpqgcy0dzsxrp0z2fzymcl1m406cy4xv1kdzada25zjaq7m";
   };
 
-  preConfigure =
-    '' rm -v externals
-       ln -sv "${externals}" externals
-    '';
-
   patches = [ ./larger-line-buffer.patch ];
+  preConfigure = "sed -i '50i\#include <GL/glu.h>' src/render/Geometry.hpp";
 
-  buildInputs = [ cmake qt4 mesa ];
+  cmakeFlags = "-DTAU_LIBRARY=${libtau}/lib/libTAU.so -DTAU_INCLUDE_DIR=${libtau}/include"; # -DTAU_DIR:PATH=${libtau}";
+
+  buildInputs = [ cmake qt4 mesa opentrace_format libtau ];
 
   NIX_LDFLAGS = "-lGLU";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77bf48513046..7acb785345a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4426,6 +4426,8 @@ let
 
   libosip = callPackage ../development/libraries/osip {};
 
+  libotf = callPackage ../development/libraries/libotf { };
+
   libotr = callPackage ../development/libraries/libotr { };
 
   libp11 = callPackage ../development/libraries/libp11 { };
@@ -4469,6 +4471,8 @@ let
 
   libtasn1 = callPackage ../development/libraries/libtasn1 { };
 
+  libtau = callPackage ../development/libraries/libtau { };
+
   libtheora = callPackage ../development/libraries/libtheora { };
 
   libtiff = callPackage ../development/libraries/libtiff { };
@@ -4773,6 +4777,8 @@ let
     };
   };
 
+  opentrace_format = callPackage ../development/libraries/opentrace-format { };
+
   ortp = callPackage ../development/libraries/ortp { };
 
   p11_kit = callPackage ../development/libraries/p11-kit { };