swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-25 14:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

openjdk10: gtk2 -> gtk3

Browse source 
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.
This commit is contained in:
Matt McHenry 2018-03-07 15:17:02 -05:00
parent aabf45c163
commit 2bd7c3a906
1 changed files with 3 additions and 3 deletions
Show stats 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" ];