diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-26 21:42:46 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-26 21:42:46 +0000 |
| commit | 3cda62f6e1b9fe934798ab27daaa0d5da7e9130c (patch) | |
| tree | f0561e8b2632a012953d17107195274585d3f075 | |
| parent | adc61253b991e2df564e48e4278fab3aefa0a09d (diff) | |
| parent | 86f8f47d870346ddbb593582d354327e6ff01237 (diff) | |
| download | nixlib-3cda62f6e1b9fe934798ab27daaa0d5da7e9130c.tar nixlib-3cda62f6e1b9fe934798ab27daaa0d5da7e9130c.tar.gz nixlib-3cda62f6e1b9fe934798ab27daaa0d5da7e9130c.tar.bz2 nixlib-3cda62f6e1b9fe934798ab27daaa0d5da7e9130c.tar.lz nixlib-3cda62f6e1b9fe934798ab27daaa0d5da7e9130c.tar.xz nixlib-3cda62f6e1b9fe934798ab27daaa0d5da7e9130c.tar.zst nixlib-3cda62f6e1b9fe934798ab27daaa0d5da7e9130c.zip | |
Trying to merge from trunk the eclipse-classic -> eclipse move.
svn merge -r 18485:18486 ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18660
| -rw-r--r-- | pkgs/applications/editors/eclipse/default.nix (renamed from pkgs/applications/editors/eclipse-classic/default.nix) | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/editors/eclipse-classic/default.nix b/pkgs/applications/editors/eclipse/default.nix index f5b2e7e93a1b..c7eadebda91c 100644 --- a/pkgs/applications/editors/eclipse-classic/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -51,4 +51,9 @@ stdenv.mkDerivation rec { ensureDir $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; + + meta = { + homepage = http://www.eclipse.org/; + description = "A extensible multi-language software development environment"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e008ff85cef5..78e8b7a1063f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6589,7 +6589,7 @@ let inherit (xlibs) libX11; }; - eclipse = import ../applications/editors/eclipse-classic { + eclipse = import ../applications/editors/eclipse { inherit stdenv fetchurl patchelf makeDesktopItem makeWrapper freetype fontconfig jre zlib; # GTK 2.18 gives glitches such as mouse clicks on buttons not # working correctly. |