diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-27 15:00:50 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-01-27 17:24:36 +0100 |
| commit | 8f217162e76d5f5449ec60f12376c70572065098 (patch) | |
| tree | 4506ad01eecf4846de10b7c6c584496738377f86 | |
| parent | 10a60af7e0867b9b551fa238dc59177276dc3304 (diff) | |
gtk2-x11: fix darwin build
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.0-darwin-x11.patch | 22 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 11 |
2 files changed, 29 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch new file mode 100644 index 0000000000000..9725cfb84260c --- /dev/null +++ b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch @@ -0,0 +1,22 @@ +--- a/gdk/x11/gdkapplaunchcontext-x11.c ++++ b/gdk/x11/gdkapplaunchcontext-x11.c +@@ -26,7 +26,6 @@ + #include <unistd.h> + + #include <glib.h> +-#include <gio/gdesktopappinfo.h> + + #include "gdkx.h" + #include "gdkapplaunchcontext.h" +@@ -363,10 +362,7 @@ + else + workspace_str = NULL; + +- if (G_IS_DESKTOP_APP_INFO (info)) +- application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); +- else +- application_id = NULL; ++ application_id = NULL; + + startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu", + g_get_prgname (), diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 266abe16c1034..c7638ea5fe5fc 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -32,10 +32,13 @@ stdenv.mkDerivation rec { 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"; - }); + ] ++ optionals stdenv.isDarwin [ + (fetchpatch { + url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; + sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; + }) + ./2.0-darwin-x11.patch + ]; propagatedBuildInputs = with xorg; [ glib cairo pango gdk_pixbuf atk ] |