diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-09-12 00:24:51 +0300 |
|---|---|---|
| committer | Kirill Boltaev <aske@fmap.me> | 2016-09-12 18:26:06 +0300 |
| commit | bccd75094fd5108b3d834ad3a86e056eed3b0337 (patch) | |
| tree | 8954184c0376ef2f8218b7df7049edde7ef6a49b /pkgs/development/compilers/oraclejdk | |
| parent | 30107249b1a5681771591cd65aa4f1c98f4cb023 (diff) | |
| download | nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.gz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.bz2 nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.lz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.xz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.zst nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.zip | |
treewide: explicitly specify gtk and related package versions
Diffstat (limited to 'pkgs/development/compilers/oraclejdk')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 775971821aae..8fe775de146f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -26,7 +26,7 @@ , mesa_noglu , freetype , fontconfig -, gnome +, gnome2 , cairo , alsaLib , atk @@ -177,7 +177,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 gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + [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] ++ (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; |