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

gtk2: fix GNOME bug #557780

Browse Source 
URL: https://gitlab.gnome.org/GNOME/gtk/issues/303

This patch will fix the assertion generated at startup for freeciv on
macOS. Conditionally applied on Darwin.

Gdk:ERROR:gdkimage-quartz.c:250:_gdk_image_new_for_depth: assertion failed: (depth == 24 || depth == 32)
This commit is contained in:
Matthew Bauer 2018-05-20 23:45:56 -05:00
parent 9eb0301eb2
commit 9b8b29f175
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gtk+/2.x.nix
View File

@ -4,6 +4,7 @@
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
, gdktarget ? "x11" , gdktarget ? "x11"
, AppKit, Cocoa , AppKit, Cocoa
, fetchpatch
}: }:
assert xineramaSupport -> xorg.libXinerama != null; assert xineramaSupport -> xorg.libXinerama != null;
@ -28,7 +29,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ];
patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ]; patches = [
./2.0-immodules.cache.patch
./gtk2-theme-paths.patch
] ++ optional stdenv.isDarwin (fetchpatch {
url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
});
propagatedBuildInputs = with xorg; propagatedBuildInputs = with xorg;
[ glib cairo pango gdk_pixbuf atk ] [ glib cairo pango gdk_pixbuf atk ]