From 75730566521b2a40836a3f215732bf6a885b5982 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:54:57 +1000 Subject: [PATCH] gtk++: fix build on darwin * add -lintl to CFLAGS --- pkgs/development/libraries/gtk+/2.x.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c7dc45aa462..6b889f76ca5 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo" + + stdenv.lib.optionalString (libintlOrEmpty != null) " -lintl"; nativeBuildInputs = [ perl pkgconfig gettext ]; @@ -34,8 +35,12 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; - meta = { + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; + homepage = http://www.gtk.org/; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 raskin ]; + platforms = platforms.all; longDescription = '' GTK+ is a highly usable, feature rich toolkit for creating @@ -47,12 +52,5 @@ stdenv.mkDerivation rec { proprietary software with GTK+ without any license fees or royalties. ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; }; }