forked from mirrors/nixpkgs
gtk3-x11: fix darwin build
This commit is contained in:
parent
bc41317e24
commit
10a60af7e0
2 changed files with 33 additions and 0 deletions
28
pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
Normal file
28
pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
--- a/gdk/x11/gdkapplaunchcontext-x11.c
|
||||||
|
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
|
||||||
|
@@ -27,7 +27,9 @@
|
||||||
|
#include "gdkprivate-x11.h"
|
||||||
|
|
||||||
|
#include <glib.h>
|
||||||
|
+#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
|
||||||
|
#include <gio/gdesktopappinfo.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
@@ -352,10 +354,15 @@
|
||||||
|
else
|
||||||
|
workspace_str = NULL;
|
||||||
|
|
||||||
|
+#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
|
||||||
|
if (G_IS_DESKTOP_APP_INFO (info))
|
||||||
|
application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
|
||||||
|
else
|
||||||
|
application_id = NULL;
|
||||||
|
+#else
|
||||||
|
+ application_id = NULL;
|
||||||
|
+#warning Please add support for creating AppInfo from id for your OS
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu",
|
||||||
|
g_get_prgname (),
|
|
@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
|
||||||
url = https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a0984cc0156ec1892a46af8f256a64878.patch;
|
url = https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a0984cc0156ec1892a46af8f256a64878.patch;
|
||||||
sha256 = "0akvp1r8xlzf5amk9gmk7b5sabr1wbmg3ak15rppsid7nf9f5dqf";
|
sha256 = "0akvp1r8xlzf5amk9gmk7b5sabr1wbmg3ak15rppsid7nf9f5dqf";
|
||||||
})
|
})
|
||||||
|
] ++ 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
|
||||||
|
# e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
|
||||||
|
./3.0-darwin-x11.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
|
buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
|
||||||
|
|
Loading…
Add table
Reference in a new issue