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 17:03:46 +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
pkgs/development/libraries/SDL2/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, audiofile
, openglSupport ? false, mesa_noglu
, openglSupport ? false, libGL
, alsaSupport ? true, alsaLib
, x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
, waylandSupport ? true, wayland, wayland-protocols, libxkbcommon
@@ -15,7 +15,7 @@
# PulseAudio.
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support);
assert openglSupport -> (stdenv.isDarwin || libGL != null && x11Support);
let
configureFlagsFun = attrs: [
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
++ [ libiconv ];
buildInputs = [ audiofile ] ++
lib.optional openglSupport mesa_noglu ++
lib.optional openglSupport libGL ++
lib.optional alsaSupport alsaLib ++
lib.optional dbusSupport dbus ++
lib.optional udevSupport udev ++