public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: transition from mesa_noglu to libGL

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 14:06:44 +02:00
parent 8da9b485ec
commit 8f2a22935c
50 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
, mesa_noglu , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
, gdk_pixbuf, atk }:
# TODO: Investigate building from source instead of patching binaries.
@@ -51,7 +51,7 @@ let drv = stdenv.mkDerivation rec {
'';
rpath = lib.makeLibraryPath ([
stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu
stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk
] ++ (with xorg; [
libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm

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

@@ -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;

4
pkgs/development/compilers/oraclejdk/jdk9-linux.nix
View File

@@ -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;

4
pkgs/development/compilers/zulu/8.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
, swingSupport ? true }:
@@ -15,7 +15,7 @@ let
extension = if stdenv.isDarwin then "zip" else "tar.gz";
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [

4
pkgs/development/compilers/zulu/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib
, swingSupport ? true }:
@@ -15,7 +15,7 @@ let
extension = if stdenv.isDarwin then "zip" else "tar.gz";
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk zlib
] ++ (lib.optionals swingSupport (with xorg; [