Loading pkgs/development/libraries/gtk/4.x.nix +2 −7 Original line number Diff line number Diff line Loading @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; version = "4.12.4"; version = "4.12.5"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; Loading @@ -80,14 +80,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; sha256 = "umfGSY5Vmfko7a+54IoyCt+qUKsvDab8arIlL8LVdSA="; sha256 = "KLNW1ZDuaO9ibi75ggst0hRBSEqaBCpaPwxA6d/E9Pg="; }; patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch ]; depsBuildBuild = [ pkg-config ]; Loading pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patchdeleted 100644 → 0 +0 −31 Original line number Diff line number Diff line diff --git a/gdk/macos/gdkmacospasteboard-private.h b/gdk/macos/gdkmacospasteboard-private.h index fdeb936..c4b8666 100644 --- a/gdk/macos/gdkmacospasteboard-private.h +++ b/gdk/macos/gdkmacospasteboard-private.h @@ -27,6 +27,10 @@ G_BEGIN_DECLS +#ifndef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER +typedef NSString *NSPasteboardType; +#endif + @interface GdkMacosPasteboardItemDataProvider : NSObject <NSPasteboardItemDataProvider> { GdkContentProvider *_contentProvider; diff --git a/gdk/macos/gdkmacospasteboard.c b/gdk/macos/gdkmacospasteboard.c index 66b3c9f..b9e0d8a 100644 --- a/gdk/macos/gdkmacospasteboard.c +++ b/gdk/macos/gdkmacospasteboard.c @@ -400,7 +400,11 @@ _gdk_macos_pasteboard_register_drag_types (NSWindow *window) gdk_content_formats_get_gtypes (formats, &n_gtypes); if (n_gtypes) +#ifdef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER [ret addObject:NSPasteboardTypeURL]; +#else + [ret addObject:[[NSString alloc] initWithUTF8String:"public.url"]]; +#endif gdk_content_formats_unref (formats); } Loading
pkgs/development/libraries/gtk/4.x.nix +2 −7 Original line number Diff line number Diff line Loading @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; version = "4.12.4"; version = "4.12.5"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; Loading @@ -80,14 +80,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; sha256 = "umfGSY5Vmfko7a+54IoyCt+qUKsvDab8arIlL8LVdSA="; sha256 = "KLNW1ZDuaO9ibi75ggst0hRBSEqaBCpaPwxA6d/E9Pg="; }; patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch ]; depsBuildBuild = [ pkg-config ]; Loading
pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patchdeleted 100644 → 0 +0 −31 Original line number Diff line number Diff line diff --git a/gdk/macos/gdkmacospasteboard-private.h b/gdk/macos/gdkmacospasteboard-private.h index fdeb936..c4b8666 100644 --- a/gdk/macos/gdkmacospasteboard-private.h +++ b/gdk/macos/gdkmacospasteboard-private.h @@ -27,6 +27,10 @@ G_BEGIN_DECLS +#ifndef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER +typedef NSString *NSPasteboardType; +#endif + @interface GdkMacosPasteboardItemDataProvider : NSObject <NSPasteboardItemDataProvider> { GdkContentProvider *_contentProvider; diff --git a/gdk/macos/gdkmacospasteboard.c b/gdk/macos/gdkmacospasteboard.c index 66b3c9f..b9e0d8a 100644 --- a/gdk/macos/gdkmacospasteboard.c +++ b/gdk/macos/gdkmacospasteboard.c @@ -400,7 +400,11 @@ _gdk_macos_pasteboard_register_drag_types (NSWindow *window) gdk_content_formats_get_gtypes (formats, &n_gtypes); if (n_gtypes) +#ifdef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER [ret addObject:NSPasteboardTypeURL]; +#else + [ret addObject:[[NSString alloc] initWithUTF8String:"public.url"]]; +#endif gdk_content_formats_unref (formats); }