ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

orackejdk: untie from gnome2

Browse Source 
Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different
This commit is contained in:
volth 2017-08-07 21:58:01 +00:00 committed by Franz Pletz
parent bfc78abf2b
commit b32a1199f8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -27,7 +27,8 @@
, mesa_noglu , mesa_noglu
, freetype , freetype
, fontconfig , fontconfig
, gnome2 , gtk2
, pango
, cairo , cairo
, alsaLib , alsaLib
, atk , atk
@ -196,7 +197,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64 * libXt is only needed on amd64
*/ */
libraries = 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 []); (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; rpath = stdenv.lib.strings.makeLibraryPath libraries;