gtk+: enable NLS support (merge #611)

@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
This commit is contained in:
Song Wenwu 2013-06-12 13:39:23 +08:00 committed by Vladimír Čunát
parent 6b433019fa
commit 92ba0a0913
3 changed files with 6 additions and 6 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf, xz
{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ perl pkgconfig ];
nativeBuildInputs = [ perl pkgconfig gettext ];
propagatedBuildInputs = with xlibs;
[ glib cairo pango gdk_pixbuf atk

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, pkgconfig, gettext
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig gettext ];
propagatedBuildInputs = with xlibs; [
expat glib cairo pango gdk_pixbuf atk at_spi2_atk
libXrandr libXrender libXcomposite libXi libXcursor

View file

@ -4091,7 +4091,7 @@ let
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { };
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3-default.nix {
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix {
inherit (gnome3) at_spi2_atk;
});
gtk = pkgs.gtk2;