diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 62f754c148e..2135c4ae52b 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -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 diff --git a/pkgs/development/libraries/gtk+/3-default.nix b/pkgs/development/libraries/gtk+/3.x.nix similarity index 94% rename from pkgs/development/libraries/gtk+/3-default.nix rename to pkgs/development/libraries/gtk+/3.x.nix index 86bd4474c7a..a22e243411a 100644 --- a/pkgs/development/libraries/gtk+/3-default.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac6c6712a92..dd25805d9ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;