diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2018-04-05 08:05:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 08:05:55 -0400 |
| commit | 59ddb3ebfbe43625a36d4863739280cedf88c404 (patch) | |
| tree | 952452b798662af757404ad6559e59583ccf3011 /pkgs/development/compilers | |
| parent | 650d8c93a16333e9390db0269327bd2d47f02fc7 (diff) | |
| parent | cb66a7468e44fd4df745fb10f8c81e3d25229d36 (diff) | |
| download | nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.gz nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.bz2 nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.lz nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.xz nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.zst nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.zip | |
Merge pull request #38397 from jerith666/eclipse-jdk10-gtk3
Update OpenJDK 10 and Eclipse to GTK 3
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/openjdk/10.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index bc7eafb92215..9cc774727b71 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -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" ]; |