From 63dbfc3aa1601c2bde1f06b6c286df9283714f37 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 27 Mar 2009 09:39:19 +0000
Subject: [PATCH] selenium remote control version bump to 1.0-beta-2

renamed attr to seleniumRCBin and adding
selenium-remote-control-1.0-beta-2 run script

svn path=/nixpkgs/trunk/; revision=14734
---
 .../tools/selenium/remote-control/default.nix | 41 +++++++++----------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
index 4c55805e5c8c..e83ae3b6ed12 100644
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -1,23 +1,22 @@
 args: with args;
-stdenv.mkDerivation {
-  name = "selenium-rc-0.8.3-binary";
-
-  src = fetchurl {
-    url = http://release.openqa.org/cgi-bin/selenium-remote-control-redirect.zip;
-    sha256 = "694b46a8440011bcedc4fdc6d01fd91c8b4b4b62b7c6629ace4e745ef47f583e";
-  };
-
-  phases = "installPhase";
-  installPhase = "
-  ensureDir \$out/lib
-  cp selenium-server-*/*.jar \$out/lib
-  ";
-
-  buildInputs = [unzip];
-
-  meta = { 
-      description = "test tool for web applications";
-      homepage = http://www.openqa.org/selenium-c;
-      license = "";
-  };
+let version = "1.0-beta-2";
+in stdenv.mkDerivation {
+    name = "selenium-remote-control-${version}-dist";
+    src = fetchurl {
+      url = "http://release.seleniumhq.org/selenium-remote-control/${version}/selenium-remote-control-${version}-dist.zip";
+      sha256 = "0ciyfqvnv0117l2rhw9dclv85mcf3czpimvybj38v3syl7m7yk41";
+    };
+    phases = "unpackPhase buildPhase";
+    buildInputs = [unzip];
+    buildPhase = ''
+      ensureDir $out/{bin,lib}
+      mv * $out/lib
+      bin="$out/bin/selenium-remote-control"
+      cat >> "$bin" << EOF
+      #!/bin/sh
+      exec ${jre}/bin/java -jar $out/lib/selenium-server-${version}/selenium-server.jar "\$@"
+      EOF
+      echo chmod +x "$bin"
+      chmod +x "$bin" 
+    '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2744b68fc473..1d91e48eb1fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2582,8 +2582,9 @@ let
   };
 
   # couldn't find the source yet
-  selenium_rc_binary = import ../development/tools/selenium/remote-control {
+  seleniumRCBin = import ../development/tools/selenium/remote-control {
     inherit fetchurl stdenv unzip;
+    jre = jdk;
   };
 
   scons = import ../development/tools/build-managers/scons {