From 0acec7e984ff38b7a296a459ba4b539a3b719c1b Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 15:12:44 +0200 Subject: treewide: transition mesa to libGLU_combined --- pkgs/development/libraries/fltk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/fltk') diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index a1e4bb8274e..ddc962d0aab 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,5 +1,5 @@ { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng +, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , darwin, libtiff, freetype }: @@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} { # this could be tidied up (?).. eg why does it require freeglut without glSupport? edf { name = "cygwin"; } # use the CygWin libraries default=no // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ mesa ]; }; } # turn on OpenGL support default=yes + // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes // edf { name = "shared"; } # turn on shared libraries default=no // edf { name = "threads"; } # enable multi-threading support // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) -- cgit 1.4.1