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

gtk3: 3.24.1 → 3.24.2

Browse Source 
Also fixes language names.
This commit is contained in:
Jan Tojnar 2018-12-24 03:10:01 +01:00
parent 44b02b52ea
commit 2a1c199e29
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes
, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection
, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 , xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3
, x11Support ? stdenv.isLinux , x11Support ? stdenv.isLinux
@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
with stdenv.lib; with stdenv.lib;
let let
version = "3.24.1"; version = "3.24.2";
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 = "0bxhsp7cjph7szg1iyv16nwi60bz59x1smjkqv6sv6mr0zipnf38"; sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -35,9 +35,14 @@ 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";
}) })
# https://gitlab.gnome.org/GNOME/gtk/issues/1521
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch;
sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl";
})
]; ];
buildInputs = [ libxkbcommon epoxy json-glib ] buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
++ optional stdenv.isDarwin AppKit; ++ optional stdenv.isDarwin AppKit;
propagatedBuildInputs = with xorg; with stdenv.lib; propagatedBuildInputs = with xorg; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas