swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-28 16:10:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

cairo: move defaults to package file

Browse source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:32:17 +00:00
parent 4bc66b1994
commit 11e3bceff0
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/cairo/default.nix
View file

@ -1,8 +1,10 @@
{ stdenv, fetchurl, pkgconfig, libiconv { config, stdenv, fetchurl, pkgconfig, libiconv
, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12 , xcbSupport ? true # no longer experimental since 1.12
, glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency , libGLSupported
, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
, libGL ? null # libGLU_combined is no longer a big dependency
, pdfSupport ? true , pdfSupport ? true
, darwin , darwin
}: }:

6
pkgs/top-level/all-packages.nix
View file

@ -10118,11 +10118,7 @@ in
pixman = callPackage ../development/libraries/pixman { }; pixman = callPackage ../development/libraries/pixman { };
cairo = callPackage ../development/libraries/cairo { cairo = callPackage ../development/libraries/cairo { };
glSupport = config.cairo.gl or (stdenv.isLinux &&
!stdenv.isAarch32 && !stdenv.isMips);
};
cairomm = callPackage ../development/libraries/cairomm { }; cairomm = callPackage ../development/libraries/cairomm { };