diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2018-03-07 15:17:02 -0500 |
|---|---|---|
| committer | Matt McHenry <github@matt.mchenryfamily.org> | 2018-04-03 12:29:39 -0400 |
| commit | 2bd7c3a906685884bfcc5996159da2d37c93b200 (patch) | |
| tree | 64993039fdf09b3a4ea86df70b875b55de443aa0 /pkgs/development/compilers | |
| parent | aabf45c1637f3de98c5ca89188573985fbff153d (diff) | |
| download | nixlib-2bd7c3a906685884bfcc5996159da2d37c93b200.tar nixlib-2bd7c3a906685884bfcc5996159da2d37c93b200.tar.gz nixlib-2bd7c3a906685884bfcc5996159da2d37c93b200.tar.bz2 nixlib-2bd7c3a906685884bfcc5996159da2d37c93b200.tar.lz nixlib-2bd7c3a906685884bfcc5996159da2d37c93b200.tar.xz nixlib-2bd7c3a906685884bfcc5996159da2d37c93b200.tar.zst nixlib-2bd7c3a906685884bfcc5996159da2d37c93b200.zip | |
openjdk10: gtk2 -> gtk3
http://openjdk.java.net/jeps/283 "Enable GTK 3 on Linux" was included in OpenJDK 9. nothing else currently in nixpkgs is using 10, so this just lets us establish a good baseline as things are ported onto it. if needed, the build could be parameterized so that any packages that turn out to need gtk2 could still use it.
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 2a0c7a1ac01c..db240dac5e20 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" ]; |