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

treewide: transition mesa to libGLU_combined

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:06:49 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libwebp/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, threadingSupport ? true # multi-threading
, openglSupport ? false, freeglut ? null, mesa ? null # OpenGL (required for vwebp)
, openglSupport ? false, freeglut ? null, libGLU_combined ? null # OpenGL (required for vwebp)
, pngSupport ? true, libpng ? null # PNG image format
, jpegSupport ? true, libjpeg ? null # JPEG image format
, tiffSupport ? true, libtiff ? null # TIFF image format
@@ -14,7 +14,7 @@
, libwebpdecoderSupport ? true # Build libwebpdecoder
}:
assert openglSupport -> ((freeglut != null) && (mesa != null));
assert openglSupport -> ((freeglut != null) && (libGLU_combined != null));
assert pngSupport -> (libpng != null);
assert jpegSupport -> (libjpeg != null);
assert tiffSupport -> (libtiff != null);
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ ]
++ optionals openglSupport [ freeglut mesa ]
++ optionals openglSupport [ freeglut libGLU_combined ]
++ optional pngSupport libpng
++ optional jpegSupport libjpeg
++ optional tiffSupport libtiff