gtk2-x11: fix darwin build
This commit is contained in:
parent
10a60af7e0
commit
8f217162e7
22
pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
Normal file
22
pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
Normal file
@ -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 (),
|
@ -32,10 +32,13 @@ stdenv.mkDerivation rec {
|
|||||||
patches = [
|
patches = [
|
||||||
./2.0-immodules.cache.patch
|
./2.0-immodules.cache.patch
|
||||||
./gtk2-theme-paths.patch
|
./gtk2-theme-paths.patch
|
||||||
] ++ optional stdenv.isDarwin (fetchpatch {
|
] ++ optionals stdenv.isDarwin [
|
||||||
url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
|
(fetchpatch {
|
||||||
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
|
url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
|
||||||
});
|
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
|
||||||
|
})
|
||||||
|
./2.0-darwin-x11.patch
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with xorg;
|
propagatedBuildInputs = with xorg;
|
||||||
[ glib cairo pango gdk_pixbuf atk ]
|
[ glib cairo pango gdk_pixbuf atk ]
|
||||||
|
Loading…
Reference in New Issue
Block a user