diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-03-01 04:20:00 -0500 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2020-03-01 04:20:00 -0500 |
commit | 2585a75cf1bf7e71b15a12f8374514232da951ba (patch) | |
tree | 3b2f361208cb35dd7931deb8fc98353b54fb98e6 /pkgs/development/libraries/gtk | |
parent | dde9dad3ae584906eea6cb64f86771ecced4e1f0 (diff) | |
download | nixpkgs-2585a75cf1bf7e71b15a12f8374514232da951ba.tar nixpkgs-2585a75cf1bf7e71b15a12f8374514232da951ba.tar.gz nixpkgs-2585a75cf1bf7e71b15a12f8374514232da951ba.tar.bz2 nixpkgs-2585a75cf1bf7e71b15a12f8374514232da951ba.tar.lz nixpkgs-2585a75cf1bf7e71b15a12f8374514232da951ba.tar.xz nixpkgs-2585a75cf1bf7e71b15a12f8374514232da951ba.tar.zst nixpkgs-2585a75cf1bf7e71b15a12f8374514232da951ba.zip |
gtk3: fix build on darwin
gdkquartz-gtk-only.h is now included in distribution tarballs [1] [1] https://gitlab.gnome.org/GNOME/gtk/-/commit/235d28f02d54e6601cef51fec91d46961f64009e
Diffstat (limited to 'pkgs/development/libraries/gtk')
-rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk/patches/missing-header.patch | 56 |
2 files changed, 0 insertions, 59 deletions
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7caf32921de..9f381c5ac70 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -77,9 +77,6 @@ stdenv.mkDerivation rec { # 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 ./patches/3.0-darwin-x11.patch - # 3.24.13 failed to ship a header file - # https://gitlab.gnome.org/GNOME/gtk/issues/2279 - ./patches/missing-header.patch ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/gtk/patches/missing-header.patch b/pkgs/development/libraries/gtk/patches/missing-header.patch deleted file mode 100644 index 49eb51dae9a..00000000000 --- a/pkgs/development/libraries/gtk/patches/missing-header.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/gdk/quartz/gdkquartz-gtk-only.h b/gdk/quartz/gdkquartz-gtk-only.h -new file mode 100644 -index 0000000000000000000000000000000000000000..193686c041971e4d8b3a1bc6bb2a79d8ba6e9a70 ---- /dev/null -+++ b/gdk/quartz/gdkquartz-gtk-only.h -@@ -0,0 +1,50 @@ -+/* gdkquartz-gtk-only.h -+ * -+ * Copyright (C) 2005-2007 Imendio AB -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+#ifndef __GDK_QUARTZ_GTK_ONLY_H__ -+#define __GDK_QUARTZ_GTK_ONLY_H__ -+ -+#if !(defined (GTK_COMPILATION) || defined (GDK_COMPILATION)) -+#error "This API is for use only in Gtk internal code." -+#endif -+ -+#include <Appkit/Appkit.h> -+#include <gdk/gdk.h> -+#include <gdk/quartz/gdkquartz.h> -+ -+/* Drag and Drop/Clipboard */ -+GDK_AVAILABLE_IN_ALL -+GdkAtom gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type); -+GDK_AVAILABLE_IN_ALL -+NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only (const gchar *target); -+GDK_AVAILABLE_IN_ALL -+NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only (GdkAtom atom); -+ -+/* Utilities */ -+GDK_AVAILABLE_IN_ALL -+NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf); -+GDK_AVAILABLE_IN_ALL -+NSEvent *gdk_quartz_event_get_nsevent (GdkEvent *event); -+ -+/* Window */ -+GDK_AVAILABLE_IN_ALL -+NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window); -+GDK_AVAILABLE_IN_ALL -+NSView *gdk_quartz_window_get_nsview (GdkWindow *window); -+ -+#endif |