cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #53960 from dtzWill/update/gtk-3.24.3

Browse source 
gtk3: 3.24.2 -> 3.24.3
This commit is contained in:
Tor Hedin Brønner 2019-01-15 15:38:16 +01:00 committed by GitHub
commit befac4ae4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/libraries/gtk+/3.x.nix
View file

@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
with stdenv.lib; with stdenv.lib;
let let
version = "3.24.2"; version = "3.24.3";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk+3-${version}"; name = "gtk+3-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"; sha256 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -35,16 +35,6 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; 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 ] buildInputs = [ libxkbcommon epoxy json-glib isocodes ]