diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 14:59:47 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:05:43 +0200 |
| commit | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (patch) | |
| tree | 05a1695ab74385d7b4a7ccac1e4bd2fc601c1d15 /pkgs/development/libraries/wxwidgets/3.0 | |
| parent | 8f2a22935c31140891591ed3bb3e6baf230bc4f0 (diff) | |
treewide: transition from mesa_glu to libGLU
Diffstat (limited to 'pkgs/development/libraries/wxwidgets/3.0')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index c96d2eb8661a..98621bb781e8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -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, libGL ? null +, withMesa ? true, libGLU ? 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 && libGL != null; +assert withMesa -> libGLU != null && libGL != null; assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa_glu + ++ optional withMesa libGLU ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - 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=' |