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:
parent
6b433019fa
commit
92ba0a0913
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
|
{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs
|
||||||
, gdk_pixbuf, xz
|
, gdk_pixbuf
|
||||||
, xineramaSupport ? true
|
, xineramaSupport ? true
|
||||||
, cupsSupport ? true, cups ? null
|
, cupsSupport ? true, cups ? null
|
||||||
}:
|
}:
|
||||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ perl pkgconfig ];
|
nativeBuildInputs = [ perl pkgconfig gettext ];
|
||||||
|
|
||||||
propagatedBuildInputs = with xlibs;
|
propagatedBuildInputs = with xlibs;
|
||||||
[ glib cairo pango gdk_pixbuf atk
|
[ glib cairo pango gdk_pixbuf atk
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, pkgconfig
|
{ stdenv, fetchurl, pkgconfig, gettext
|
||||||
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs
|
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs
|
||||||
, xineramaSupport ? true
|
, xineramaSupport ? true
|
||||||
, cupsSupport ? true, cups ? null
|
, cupsSupport ? true, cups ? null
|
||||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig gettext ];
|
||||||
propagatedBuildInputs = with xlibs; [
|
propagatedBuildInputs = with xlibs; [
|
||||||
expat glib cairo pango gdk_pixbuf atk at_spi2_atk
|
expat glib cairo pango gdk_pixbuf atk at_spi2_atk
|
||||||
libXrandr libXrender libXcomposite libXi libXcursor
|
libXrandr libXrender libXcomposite libXi libXcursor
|
|
@ -4091,7 +4091,7 @@ let
|
||||||
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
|
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
|
||||||
|
|
||||||
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { };
|
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;
|
inherit (gnome3) at_spi2_atk;
|
||||||
});
|
});
|
||||||
gtk = pkgs.gtk2;
|
gtk = pkgs.gtk2;
|
||||||
|
|
Loading…
Reference in a new issue