diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-25 20:51:04 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-25 21:01:40 +0100 |
commit | ac07b3d37f430769f13bb6a2fa7203eec4c18d22 (patch) | |
tree | 8acdfd9753555b8fff864f59f06e8fb9f7359453 /pkgs/development/libraries/gtk+ | |
parent | c9b581b5d4b337051901de41d19a947fec1d8ae0 (diff) | |
download | nixlib-ac07b3d37f430769f13bb6a2fa7203eec4c18d22.tar nixlib-ac07b3d37f430769f13bb6a2fa7203eec4c18d22.tar.gz nixlib-ac07b3d37f430769f13bb6a2fa7203eec4c18d22.tar.bz2 nixlib-ac07b3d37f430769f13bb6a2fa7203eec4c18d22.tar.lz nixlib-ac07b3d37f430769f13bb6a2fa7203eec4c18d22.tar.xz nixlib-ac07b3d37f430769f13bb6a2fa7203eec4c18d22.tar.zst nixlib-ac07b3d37f430769f13bb6a2fa7203eec4c18d22.zip |
gtk3: bugfix update 3.10.5 -> .6
Diffstat (limited to 'pkgs/development/libraries/gtk+')
-rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index e3237f83b74b..651ac0d303b9 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -10,27 +10,27 @@ assert cupsSupport -> cups != null; let ver_maj = "3.10"; - ver_min = "5"; # .6 needs currently unreleased wayland for introspection (wl_proxy_marshal_constructor) + ver_min = "6"; in stdenv.mkDerivation rec { name = "gtk+-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz"; - sha256 = "1iyc566r61d3jfdiq5knwbssq5bsqsn8hqzdm30vmw6dx3cgd49i"; + sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - buildInputs = [ wayland libxkbcommon ]; + buildInputs = [ libxkbcommon ]; propagatedBuildInputs = with xlibs; with stdenv.lib; [ 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 - ++ stdenv.lib.optional xineramaSupport libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups ]; + ++ optional xineramaSupport libXinerama + ++ optional cupsSupport cups; postInstall = "rm -rf $out/share/gtk-doc"; |