public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtk3: major update to 3.6.4

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-21 17:46:50 +01:00
parent 713b420be8
commit 811605c3a4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/gtk+/3.2.x.nix → pkgs/development/libraries/gtk+/3-default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs { stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf, xz , gdk_pixbuf, xz, at_spi2_atk
, xineramaSupport ? true , xineramaSupport ? true
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
}: }:
@ -8,21 +8,19 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk+-3.2.4"; name = "gtk+-3.6.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz"; url = "mirror://gnome/sources/gtk+/3.6/${name}.tar.xz";
sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd"; sha256 = "18gijn9ghzv7d6np10q9bhp7lwgjb462n3xj1dn9hkwkdyc3gnnv";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ perl pkgconfig ]; buildInputs = with xlibs; [
pkgconfig glib atk pango gdk_pixbuf at_spi2_atk
propagatedBuildInputs = libXrandr libXrender libXcomposite libXi
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo ]
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ]; ++ stdenv.lib.optionals cupsSupport [ cups ];

4
pkgs/top-level/all-packages.nix
View File

@ -3894,7 +3894,9 @@ let
gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.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-default.nix {
inherit (gnome3) at_spi2_atk;
});
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
gtksharp = gtksharp2; gtksharp = gtksharp2;