From 761e7453ab470d95ad184f4c9859398f44827988 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Oct 2008 12:56:34 +0000
Subject: [PATCH] removed eclipse_classic_src (supreseded by eclipseNew)
svn path=/nixpkgs/trunk/; revision=13136
---
.../editors/eclipse/eclipse_classic.nix | 57 -------------------
pkgs/top-level/all-packages.nix | 8 ---
2 files changed, 65 deletions(-)
delete mode 100644 pkgs/applications/editors/eclipse/eclipse_classic.nix
diff --git a/pkgs/applications/editors/eclipse/eclipse_classic.nix b/pkgs/applications/editors/eclipse/eclipse_classic.nix
deleted file mode 100644
index 2d3b22e476e7..000000000000
--- a/pkgs/applications/editors/eclipse/eclipse_classic.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-# Note, if you want to install plugins using the update manager you should
-# copy the store path to a local directory and chown -R $USER yourcopy
-# Then start your local copy
-
-args: with args;
-let arch = if stdenv.system == "x86_64-linux" then "x86_64"
- else if stdenv.system == "i686-linux" then "x86"
- else throw "not supported system";
-in
-args.stdenv.mkDerivation rec {
- #name = "eclipse-classic-3.4M5";
- name = "eclipse-classic-3.3.1.1";
-
- unpackPhase = "unzip \$src; set -x ";
- buildInputs = [ unzip jdk gtk glib libXtst ant makeWrapper];
-
-
- patches=./build_with_jdk_compiler;
-
- buildPhase = "./build -os linux -ws gtk -arch ${arch}";
-
- libraries = [gtk glib libXtst];
-
- installPhase = "
- t=\$out/share/${name}
- ensureDir \$t \$out/bin
- cd result
- tar xfz linux-gtk-*.tar.gz
- mv eclipse \$out
- "
- #copied from other eclipse expressions
- +" rpath=
- for i in \$libraries; do
- rpath=\$rpath\${rpath:+:}\$i/lib
- done
- find \$out \\( -type f -a -perm +0100 \\) \\
- -print \\
- -exec patchelf --interpreter \"$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\
- --set-rpath \"\$rpath\" {} \\;
-
- # Make a wrapper script so that the proper JDK is found.
- makeWrapper \$out/eclipse/eclipse \$out/bin/eclipse \\
- --prefix PATH \":\" \"\$jdk/bin\" \\
- --prefix LD_LIBRARY_PATH \":\" \"\$rpath\"
- sed -e 's=exec.*=exec \$(dirname $0)/../eclipse/eclipse $@=' -i \$out/bin/eclipse
- ";
- # using dirname so that eclipse still runs after copying the whole store
- # directory somewhere else (so that you can use the update manager
-
- src = args.fetchurl {
- #url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/eclipse-sourceBuild-srcIncluded-3.4M5.zip;
- #sha256 = "1w6fbpwkys65whygc045556772asggj24x8assnaba6nl70z00az";
-
- url = http://download.micromata.de/eclipse/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip;
- sha256 = "0n56i7ml816f839704qlkgs5ahl0iqgwc80kjq7n7g5rl9a4vhp4";
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67fe5f188af4..fa57248bb89e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7015,14 +7015,6 @@ let
inherit (xlibs) libXtst;
});
- # building eclipise from source
- # experimental tested on x86_64-linux only
- eclipse_classic_src = import ../applications/editors/eclipse/eclipse_classic.nix {
- inherit fetchurl stdenv makeWrapper jdk unzip ant;
- inherit (gtkLibs) gtk glib;
- inherit (xlibs) libXtst;
- };
-
eclipse = plugins:
import ../applications/editors/eclipse {
inherit fetchurl stdenv makeWrapper jdk;