diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 14:06:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:03:46 +0200 |
| commit | 8f2a22935c31140891591ed3bb3e6baf230bc4f0 (patch) | |
| tree | 30cd829c96a4abaffff99dcc027eba0e2e064ef1 /pkgs/development/compilers/oraclejdk | |
| parent | 8da9b485ec008c9c7c4adcfa604a289b3050c2c6 (diff) | |
| download | nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.gz nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.bz2 nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.lz nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.xz nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.tar.zst nixlib-8f2a22935c31140891591ed3bb3e6baf230bc4f0.zip | |
treewide: transition from mesa_noglu to libGL
Diffstat (limited to 'pkgs/development/compilers/oraclejdk')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk9-linux.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 04fe377fab3b..baa136b798d9 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -22,7 +22,7 @@ , libav_0_8 , ffmpeg , libxslt -, mesa_noglu +, libGL , freetype , fontconfig , gtk2 @@ -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 pango gtk2 cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL 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; diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix index f9b48f239fa7..87f2e49b4431 100644 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix @@ -11,7 +11,7 @@ , libxml2 , ffmpeg_2 , libxslt -, mesa_noglu +, libGL , freetype , fontconfig , gtk2 @@ -136,7 +136,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ + [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ (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; |