Skip to content

Commit

Permalink
gtk3: Update to new upstream version 3.6.2.
Browse files Browse the repository at this point in the history
Unity needs at least version 3.4, so let's just update to the latest version.
We're gonna extensively test this branch either so we can fix other packages
that depend on gtk3 as well, if it should be needed. Luckily there are just a
few of those.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
  • Loading branch information
aszlig committed Dec 12, 2012
1 parent 8b574e9 commit 827752a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf, xz
{ stdenv, fetchurl, pkgconfig, glib, atk, at_spi2_atk, pango, cairo, perl
, xlibs, gdk_pixbuf, xz
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
, enableIntrospection ? false, gobjectIntrospection ? null
Expand All @@ -20,19 +20,19 @@ let
inherit enableIntrospection;
};
in stdenv.mkDerivation rec {
name = "gtk+-3.2.4";
name = "gtk+-3.6.2";

src = fetchurl {
url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz";
sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd";
url = "mirror://gnome/sources/gtk+/3.6/${name}.tar.xz";
sha256 = "0g2izqjvwxkhhjrna5iqby9qi67ix1w0aa8ng3rsqf33azhz5k5a";
};

enableParallelBuilding = true;

buildNativeInputs = [ perl pkgconfig ];

propagatedBuildInputs =
[ xlibs.xlibs glib pangoGir pixbufGir atkGir cairo
[ xlibs.xlibs glib pangoGir pixbufGir atkGir at_spi2_atk cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3881,7 +3881,7 @@ let
gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { };

gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.6.x.nix { });

gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
gtksharp = gtksharp2;
Expand Down

0 comments on commit 827752a

Please sign in to comment.