public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
parent 650d8c93a1 cb66a7468e
commit 59ddb3ebfb
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
, libjpeg, giflib
, setJavaClassPath
, minimal ? false
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
let
@@ -38,7 +38,7 @@ let
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor lndir fontconfig
] ++ lib.optionals (!minimal && enableGnome2) [
gtk2 gnome_vfs GConf glib
gtk3 gnome_vfs GConf glib
];
patches = [
@@ -80,7 +80,7 @@ let
NIX_LDFLAGS= lib.optionals (!minimal) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ 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" ];