Skip to content

Commit

Permalink
openjdk10: gtk2 -> gtk3
Browse files Browse the repository at this point in the history
as in d806f50 for openjdk9
  • Loading branch information
jerith666 committed Mar 26, 2018
1 parent aabf45c commit 599071d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/development/compilers/openjdk/10.nix
Expand Up @@ -4,7 +4,7 @@
, libjpeg, giflib
, setJavaClassPath
, minimal ? false
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:

let
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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" ];
Expand Down

0 comments on commit 599071d

Please sign in to comment.