From 63051ab66bc72bef15750658a0dbdecf7eec6e0c Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Fri, 6 Sep 2013 23:54:46 +1000 Subject: [PATCH] cogl: fix build on darwin (close #924) --- pkgs/development/libraries/cogl/default.nix | 33 +++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index b697ed87edc..9c3a1a4d674 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf -, pangoSupport ? true, pango, cairo -, libXfixes, libXcomposite, libXdamage }: +{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite +, libXdamage, libintlOrEmpty +, pangoSupport ? true, pango, cairo }: stdenv.mkDerivation rec { name = "cogl-1.8.2"; @@ -13,19 +13,28 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = - [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]; + [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ] + ++ libintlOrEmpty; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - meta = { + COGL_PANGO_DEP_CFLAGS + = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) + "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + meta = with stdenv.lib; { description = "A small open source library for using 3D graphics hardware for rendering"; - longDescription = - '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each others toes. - ''; + maintainers = with maintainers; [ lovek323 ]; + + longDescription = '' + Cogl is a small open source library for using 3D graphics hardware for + rendering. The API departs from the flat state machine style of OpenGL + and is designed to make it easy to write orthogonal components that can + render without stepping on each other's toes. + ''; + inherit (glib.meta) platforms; }; }