alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #57541 from dtzWill/update/gtk-3.24.7

Browse source 
gtk3: 3.24.5 -> 3.24.7
This commit is contained in:
Will Dietz 2019-03-14 14:20:11 -05:00 committed by GitHub
parent 20c0730565 bf072fcfb1
commit 941859dadf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
with stdenv.lib;
let
version = "3.24.5";
version = "3.24.7";
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 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b";
sha256 = "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj";
};
outputs = [ "out" "dev" ];
@ -35,18 +35,6 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
(fetchpatch {
name = "fix-fribidi-linking.patch";
url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
})
(fetchpatch {
# https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged
# but isn't in 3.24.5
name = "export-missing-symbols.patch";
url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
})
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it