From ba6556058dd7de2c09b8dcb0e83860abf46a8288 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Sep 2005 14:10:04 +0000
Subject: [PATCH] * Eclipse: add a wrapper in $out/bin.

svn path=/nixpkgs/trunk/; revision=3946
---
 pkgs/applications/editors/eclipse/builder.sh  | 11 ++++++-----
 pkgs/applications/editors/eclipse/default.nix |  3 ++-
 pkgs/system/all-packages-generic.nix          |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/builder.sh b/pkgs/applications/editors/eclipse/builder.sh
index 9a7e56312d74..b703b3bc5ad4 100755
--- a/pkgs/applications/editors/eclipse/builder.sh
+++ b/pkgs/applications/editors/eclipse/builder.sh
@@ -1,7 +1,8 @@
-set -e
+source $stdenv/setup
+source $makeWrapper
 
-. $stdenv/setup
-
-tar zxvf $src 
-mkdir $out
+unpackFile $src 
+ensureDir $out
 mv eclipse $out/
+
+makeWrapper $out/eclipse/eclipse $out/bin/eclipse
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index ce0721272190..13e04cd965c4 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv}:
+{fetchurl, stdenv, makeWrapper}:
 
 let {
   body =
@@ -6,6 +6,7 @@ let {
       name = "eclipse-sdk-3.1";
       builder = ./builder.sh;
       src = bindist;
+      inherit makeWrapper;
    };
 
   bindist = 
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 4a5de2eaece2..d4febe859ff5 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1545,7 +1545,7 @@ rec {
   };
 
   eclipse = (import ../applications/editors/eclipse) {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv makeWrapper;
   };
 
   monodevelop = (import ../applications/editors/monodevelop) {