summary refs log tree commit diff
path: root/pkgs/development/libraries/cairo
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2011-09-20 06:22:14 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2011-09-20 06:22:14 +0000
commit4e9fbf18ed527ec913bd2c173450a9d69a7adf7a (patch)
tree61dda2059225230f9b6b9b048de6286331ab3a68 /pkgs/development/libraries/cairo
parente5062a4c5c20cea5a28184394bfaf7a257a8e405 (diff)
downloadnixlib-4e9fbf18ed527ec913bd2c173450a9d69a7adf7a.tar
nixlib-4e9fbf18ed527ec913bd2c173450a9d69a7adf7a.tar.gz
nixlib-4e9fbf18ed527ec913bd2c173450a9d69a7adf7a.tar.bz2
nixlib-4e9fbf18ed527ec913bd2c173450a9d69a7adf7a.tar.lz
nixlib-4e9fbf18ed527ec913bd2c173450a9d69a7adf7a.tar.xz
nixlib-4e9fbf18ed527ec913bd2c173450a9d69a7adf7a.tar.zst
nixlib-4e9fbf18ed527ec913bd2c173450a9d69a7adf7a.zip
Build cairo-gobject library
Move cairo to gtkLibs.cairo

svn path=/nixpkgs/trunk/; revision=29380
Diffstat (limited to 'pkgs/development/libraries/cairo')
-rw-r--r--pkgs/development/libraries/cairo/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 1e478b1c68d9..62e907264d5e 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -2,6 +2,7 @@
 , pdfSupport ? true
 , pngSupport ? true
 , xcbSupport ? false
+, gobjectSupport ? true, glib
 , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
 , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
 }:
@@ -19,8 +20,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ 
-    stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
+    [ pkgconfig x11 fontconfig pixman xlibs.libXrender ]
+    ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
+    ++ stdenv.lib.optional gobjectSupport glib;
 
   propagatedBuildInputs =
     [ freetype ] ++