diff options
| author | volth <volth@webmaster.ms> | 2017-08-07 21:58:01 +0000 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-08 02:16:26 +0200 |
| commit | b32a1199f88e64ec3191b0322017b11379c36d90 (patch) | |
| tree | cac2735ed1d13f0cdbf5f8806d3f664dc0b8b679 | |
| parent | bfc78abf2b47c10f3f7451e43f520984d6212195 (diff) | |
| download | nixpkgs-b32a1199f88e64ec3191b0322017b11379c36d90.tar nixpkgs-b32a1199f88e64ec3191b0322017b11379c36d90.tar.gz nixpkgs-b32a1199f88e64ec3191b0322017b11379c36d90.tar.bz2 nixpkgs-b32a1199f88e64ec3191b0322017b11379c36d90.tar.lz nixpkgs-b32a1199f88e64ec3191b0322017b11379c36d90.tar.xz nixpkgs-b32a1199f88e64ec3191b0322017b11379c36d90.tar.zst nixpkgs-b32a1199f88e64ec3191b0322017b11379c36d90.zip | |
orackejdk: untie from gnome2
Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index fec038199ad..2a00cf5f2d2 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -27,7 +27,8 @@ , mesa_noglu , freetype , fontconfig -, gnome2 +, gtk2 +, pango , cairo , alsaLib , atk @@ -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; |