From 2002b8a46359942cd08f12c82a5dc38a3c04db4b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Jan 2019 11:52:33 -0600 Subject: [PATCH] gtk3: 3.24.2 -> 3.24.3 * Drop patches, now included! * Fixes system tray icon madness w/awesomeWM (and others?), oh joyous day what a time to be alive :) (parent_relative fixups, been using for a while, woohoo!) --- pkgs/development/libraries/gtk+/3.x.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 01133b92ee13..6a1fcf78cb3f 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,14 +13,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.2"; + version = "3.24.3"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"; + sha256 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p"; }; outputs = [ "out" "dev" ]; @@ -35,16 +35,6 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1521 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch; - sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl"; - }) - # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1523 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a0984cc0156ec1892a46af8f256a64878.patch; - sha256 = "0akvp1r8xlzf5amk9gmk7b5sabr1wbmg3ak15rppsid7nf9f5dqf"; - }) ]; buildInputs = [ libxkbcommon epoxy json-glib isocodes ]