JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38397 from jerith666/eclipse-jdk10-gtk3

Browse Source 
Update OpenJDK 10 and Eclipse to GTK 3
This commit is contained in:
Tim Steinbach 2018-04-05 08:05:55 -04:00 committed by GitHub
commit 59ddb3ebfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/eclipse/build-eclipse.nix
View File

@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2 , zlib, jdk, glib, gtk3, libXtst, gsettings-desktop-schemas, webkitgtk
, makeWrapper, ... }: , makeWrapper, ... }:
{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11 fontconfig freetype glib gsettings-desktop-schemas gtk3 jdk libX11
libXrender libXtst makeWrapper zlib libXrender libXtst makeWrapper zlib
] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk;
buildCommand = '' buildCommand = ''
# Unpack tarball. # Unpack tarball.
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jdk}/bin \ --prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2)} \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"

6
pkgs/applications/editors/eclipse/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXext, libXrender, zlib , freetype, fontconfig, libX11, libXext, libXrender, zlib
, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas , glib, gtk3, libXtst, jdk, gsettings-desktop-schemas
, webkitgtk24x-gtk2 ? null # for internal web browser , webkitgtk ? null # for internal web browser
, buildEnv, writeText, runCommand , buildEnv, writeText, runCommand
, callPackage , callPackage
}: }:
@ -15,7 +15,7 @@ rec {
buildEclipse = import ./build-eclipse.nix { buildEclipse = import ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2 jdk glib gtk3 libXtst gsettings-desktop-schemas webkitgtk
makeWrapper; makeWrapper;
}; };

6
pkgs/development/compilers/openjdk/10.nix
View File

@ -4,7 +4,7 @@
, libjpeg, giflib , libjpeg, giflib
, setJavaClassPath , setJavaClassPath
, minimal ? false , minimal ? false
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}: }:
let let
@ -38,7 +38,7 @@ let
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor lndir fontconfig libXi libXinerama libXcursor lndir fontconfig
] ++ lib.optionals (!minimal && enableGnome2) [ ] ++ lib.optionals (!minimal && enableGnome2) [
gtk2 gnome_vfs GConf glib gtk3 gnome_vfs GConf glib
]; ];
patches = [ patches = [
@ -80,7 +80,7 @@ let
NIX_LDFLAGS= lib.optionals (!minimal) [ NIX_LDFLAGS= lib.optionals (!minimal) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!minimal && enableGnome2) [ ] ++ lib.optionals (!minimal && enableGnome2) [
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
]; ];
buildFlags = [ "all" ]; buildFlags = [ "all" ];

4
pkgs/top-level/all-packages.nix
View File

@ -15241,7 +15241,9 @@ with pkgs;
eaglemode = callPackage ../applications/misc/eaglemode { }; eaglemode = callPackage ../applications/misc/eaglemode { };
eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk24x-gtk2 = null; }); eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse {
jdk = jdk10;
});
ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; ecs-agent = callPackage ../applications/virtualization/ecs-agent { };