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

gtk3: bugfix update 3.10.5 -> .6

Browse Source
This commit is contained in:
Vladimír Čunát 2014-01-25 20:51:04 +01:00
parent c9b581b5d4
commit ac07b3d37f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -10,27 +10,27 @@ assert cupsSupport -> cups != null;
let let
ver_maj = "3.10"; ver_maj = "3.10";
ver_min = "5"; # .6 needs currently unreleased wayland for introspection (wl_proxy_marshal_constructor) ver_min = "6";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk+-${ver_maj}.${ver_min}"; name = "gtk+-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
sha256 = "1iyc566r61d3jfdiq5knwbssq5bsqsn8hqzdm30vmw6dx3cgd49i"; sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
buildInputs = [ wayland libxkbcommon ]; buildInputs = [ libxkbcommon ];
propagatedBuildInputs = with xlibs; with stdenv.lib; propagatedBuildInputs = with xlibs; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
++ optional stdenv.isDarwin x11 ++ optional stdenv.isDarwin x11
++ stdenv.lib.optional xineramaSupport libXinerama ++ optional xineramaSupport libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ]; ++ optional cupsSupport cups;
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";