diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 14:06:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:03:46 +0200 |
| commit | 8f2a22935c31140891591ed3bb3e6baf230bc4f0 (patch) | |
| tree | 30cd829c96a4abaffff99dcc027eba0e2e064ef1 /pkgs/development/libraries/cairo | |
| parent | 8da9b485ec008c9c7c4adcfa604a289b3050c2c6 (diff) | |
treewide: transition from mesa_noglu to libGL
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7c0e36d40689..64b86d66913c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,12 +2,12 @@ , libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency +, glSupport ? true, libGL ? null # mesa is no longer a big dependency , pdfSupport ? true , darwin }: -assert glSupport -> mesa_noglu != null; +assert glSupport -> libGL != null; let inherit (stdenv.lib) optional optionals; in @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib - ++ optional glSupport mesa_noglu + ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? configureFlags = if stdenv.isDarwin then [ |