diff options
author | Peter Simons <simons@cryp.to> | 2009-03-10 12:01:22 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2009-03-10 12:01:22 +0000 |
commit | 610aac30c39d7bbf0caf41e46d75e8842542facd (patch) | |
tree | 93a3402e65dc7463d75a013737d21e1520d228e3 /pkgs/development/tools/parsing | |
parent | 68e6471a70f60ac68145a3da0d9aab83f087813b (diff) |
Fixed Python StringTemplate library.
Most importantly, this change required updating the ANTLR 2.x expression to install the Python run-time library. While we're at it, we're building the run-time library for C++ and Java, too. There is still work to be done: the stringtemplate library doesn't find antlr.py without help yet. svn path=/nixpkgs/trunk/; revision=14489
Diffstat (limited to 'pkgs/development/tools/parsing')
-rw-r--r-- | pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/antlr/builder2.sh | 16 |
2 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix b/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix index 43151ba589af5..baadc510f89f9 100644 --- a/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix +++ b/pkgs/development/tools/parsing/antlr/antlr-2.7.6.nix @@ -1,11 +1,10 @@ -{stdenv, fetchurl, jre}: +{stdenv, fetchurl, jdk, python}: stdenv.mkDerivation { name = "antlr-2.7.6"; - builder = ./builder2.sh; src = fetchurl { url = http://www.antlr.org/download/antlr-2.7.6.tar.gz; md5 = "17d8bf2e814f0a26631aadbbda8d7324"; }; - inherit jre; + buildInputs = [jdk python]; } diff --git a/pkgs/development/tools/parsing/antlr/builder2.sh b/pkgs/development/tools/parsing/antlr/builder2.sh deleted file mode 100644 index 75477393aa22f..0000000000000 --- a/pkgs/development/tools/parsing/antlr/builder2.sh +++ /dev/null @@ -1,16 +0,0 @@ -source $stdenv/setup - -tar zxvf $src -cd antlr-* - -ensureDir $out/bin -ensureDir $out/lib/$name - -cp antlr.jar $out/lib/$name - -cat > $out/bin/antlr <<EOF -#! $SHELL -$jre/bin/java -cp $out/lib/$name/antlr.jar -Xms200M -Xmx400M antlr.Tool \$* -EOF - -chmod u+x $out/bin/antlr |