MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Trying to merge from trunk the eclipse-classic -> eclipse move.

Browse source 
svn merge -r 18485:18486 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18660
This commit is contained in:
Lluís Batlle i Rossell 2009-11-26 21:42:46 +00:00
commit 3cda62f6e1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/editors/eclipse-classic/default.nix → pkgs/applications/editors/eclipse/default.nix
View file

@ -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";
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -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.