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

treewide: transition from mesa_glu to libGLU

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:05:43 +02:00
parent 8f2a22935c
commit 1bc1909e5b
42 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/wxwidgets/2.9/default.nix
+4 -4
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, libGL ? null
, withMesa ? true, libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
}:
assert withMesa -> mesa_glu != null && libGL != null;
assert withMesa -> libGLU != null && libGL != null;
with stdenv.lib;
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa mesa_glu
++ optional withMesa libGLU
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
nativeBuildInputs = [ pkgconfig ];
@@ -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 ${libGL.out}/lib ";
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
preConfigure = "
substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='