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

6
pkgs/development/libraries/wxwidgets/2.8/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gst-plugins-base, GConf, libX11, cairo
, withMesa ? true, mesa_glu ? null, mesa_noglu ? null
, withMesa ? true, mesa_glu ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true,
}:
assert withMesa -> mesa_glu != null && mesa_noglu != null;
assert withMesa -> mesa_glu != null && libGL != null;
with stdenv.lib;
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
"${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include";
SEARCH_LIB =
"${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib "
+ optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib ";
+ optionalString withMesa "${mesa_glu.out}/lib ${libGL.out}/lib ";
# Work around a bug in configure.
NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ];

6
pkgs/development/libraries/wxwidgets/2.9/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, mesa_glu ? null, mesa_noglu ? null
, withMesa ? true, mesa_glu ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
}:
assert withMesa -> mesa_glu != null && mesa_noglu != null;
assert withMesa -> mesa_glu != null && libGL != null;
with stdenv.lib;
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
# allow building on 64-bit
[ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ];
SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib ";
SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib ";
preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='

6
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig
, gtk2, gtk3, libXinerama, libSM, libXxf86vm
, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, mesa_glu ? null, mesa_noglu ? null
, withMesa ? true, mesa_glu ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null
@@ -9,7 +9,7 @@
}:
assert withMesa -> mesa_glu != null && mesa_noglu != null;
assert withMesa -> mesa_glu != null && libGL != null;
assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null;
with stdenv.lib;
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
++ optionals withWebKit
["--enable-webview" "--enable-webview-webkit"];
SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib ";
SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib ";
preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='