From 35cbabdab466c4994c2a9837f687d82f0f287748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 22 Jul 2010 09:01:42 +0000 Subject: [PATCH] ViTE from SVN. svn path=/nixpkgs/trunk/; revision=22696 --- .../science/misc/vite/default.nix | 31 ++++++++++++++----- .../misc/vite/larger-line-buffer.patch | 14 +++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/science/misc/vite/larger-line-buffer.patch diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index a340fb2080b3..24060c277fd4 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,12 +1,29 @@ -{ fetchurl, stdenv, cmake, qt, mesa }: +{ fetchsvn, stdenv, cmake, qt, mesa }: -stdenv.mkDerivation { - name = "vite-1.1"; - - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/26321/vite_1005.tar.gz"; - sha256 = "11l39809i1hjizw89x23d6m246w7a64z11bhrx7q5h0scvwd1imr"; +# ViTE 1.1 has several bugs, so use the SVN version. +let + rev = "1143"; + externals = fetchsvn { + url = "svn://scm.gforge.inria.fr/svn/vite/externals"; + sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a"; + inherit rev; }; +in +stdenv.mkDerivation { + name = "vite-1.2pre${rev}"; + + src = fetchsvn { + url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; + sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4"; + inherit rev; + }; + + preConfigure = + '' rm -v externals + ln -sv "${externals}" externals + ''; + + patches = [ ./larger-line-buffer.patch ]; buildInputs = [ cmake qt mesa ]; diff --git a/pkgs/applications/science/misc/vite/larger-line-buffer.patch b/pkgs/applications/science/misc/vite/larger-line-buffer.patch new file mode 100644 index 000000000000..7934c0085c19 --- /dev/null +++ b/pkgs/applications/science/misc/vite/larger-line-buffer.patch @@ -0,0 +1,14 @@ +ViTE has an arbitrary restriction on the length of lines read by the parser. +Make it larger. + +--- a/src/parser/PajeFileManager.hpp ++++ b/src/parser/PajeFileManager.hpp +@@ -67,7 +67,7 @@ + + #include + +-#define _PAJE_BUFSIZE 256 ++#define _PAJE_BUFSIZE 16384 + #define _PAJE_NBMAXTKS 16 + + /** diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f5cb1f2c40d..07466a61b8e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9784,7 +9784,7 @@ let }; vite = import ../applications/science/misc/vite { - inherit fetchurl cmake mesa; + inherit fetchsvn cmake mesa; qt = qt4; stdenv = stdenv2; };