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

Build cairo-gobject library

Browse Source 
Move cairo to gtkLibs.cairo

svn path=/nixpkgs/trunk/; revision=29380
This commit is contained in:
Yury G. Kudryashov 2011-09-20 06:22:14 +00:00
parent e5062a4c5c
commit 4e9fbf18ed
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
, pdfSupport ? true , pdfSupport ? true
, pngSupport ? true , pngSupport ? true
, xcbSupport ? false , xcbSupport ? false
, gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
}: }:
@ -19,8 +20,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ [ pkgconfig x11 fontconfig pixman xlibs.libXrender ]
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
++ stdenv.lib.optional gobjectSupport glib;
propagatedBuildInputs = propagatedBuildInputs =
[ freetype ] ++ [ freetype ] ++

8
pkgs/top-level/all-packages.nix
View File

@ -3084,8 +3084,6 @@ let
buddy = callPackage ../development/libraries/buddy { }; buddy = callPackage ../development/libraries/buddy { };
cairo = callPackage ../development/libraries/cairo { };
cairomm = callPackage ../development/libraries/cairomm { }; cairomm = callPackage ../development/libraries/cairomm { };
scmccid = callPackage ../development/libraries/scmccid { }; scmccid = callPackage ../development/libraries/scmccid { };
@ -3510,7 +3508,7 @@ let
gtkLibs = pkgs.gtkLibs224; gtkLibs = pkgs.gtkLibs224;
inherit (pkgs.gtkLibs) glib gtk pango; inherit (pkgs.gtkLibs) glib gtk pango cairo;
gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in { gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
@ -3528,6 +3526,8 @@ let
atk = callPackage ../development/libraries/atk/1.24.x.nix { }; atk = callPackage ../development/libraries/atk/1.24.x.nix { };
cairo = callPackage ../development/libraries/cairo { };
pango = callPackage ../development/libraries/pango/1.24.x.nix { }; pango = callPackage ../development/libraries/pango/1.24.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.14.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.14.x.nix { };
@ -3546,6 +3546,8 @@ let
atk = callPackage ../development/libraries/atk/1.32.x.nix { }; atk = callPackage ../development/libraries/atk/1.32.x.nix { };
cairo = callPackage ../development/libraries/cairo { };
pango = callPackage ../development/libraries/pango/1.28.x.nix { }; pango = callPackage ../development/libraries/pango/1.28.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { };