Skip to content

Commit

Permalink
orackejdk: untie from gnome2
Browse files Browse the repository at this point in the history
Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different
  • Loading branch information
volth authored and fpletz committed Aug 8, 2017
1 parent bfc78ab commit b32a119
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
, mesa_noglu
, freetype
, fontconfig
, gnome2
, gtk2
, pango
, cairo
, alsaLib
, atk
Expand Down Expand Up @@ -196,7 +197,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64
*/
libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);

rpath = stdenv.lib.strings.makeLibraryPath libraries;
Expand Down

0 comments on commit b32a119

Please sign in to comment.