Merge pull request #61942 from smaret/gtk-x11-fix

gtk{2,3}-x11: build against pango with X11 support enabled
This commit is contained in:
Matthew Bauer 2019-05-23 14:14:59 -05:00 committed by GitHub
commit 2fc20134de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10743,6 +10743,7 @@ in
gtk2-x11 = gtk2.override { gtk2-x11 = gtk2.override {
cairo = cairo.override { x11Support = true; }; cairo = cairo.override { x11Support = true; };
pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; };
gdktarget = "x11"; gdktarget = "x11";
}; };
@ -10753,6 +10754,7 @@ in
# On darwin gtk uses cocoa by default instead of x11. # On darwin gtk uses cocoa by default instead of x11.
gtk3-x11 = gtk3.override { gtk3-x11 = gtk3.override {
cairo = cairo.override { x11Support = true; }; cairo = cairo.override { x11Support = true; };
pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; };
x11Support = true; x11Support = true;
}; };