From c2fc19b6bc741601c76cc28b14e14c7d8166c5d9 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 29 Mar 2025 16:12:36 -0700
Subject: [PATCH 1/2] goocanvas: unbreak GCC 14, modernize

---
 pkgs/development/libraries/goocanvas/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix
index 6e4655a872e3..4f649b92f442 100644
--- a/pkgs/development/libraries/goocanvas/default.nix
+++ b/pkgs/development/libraries/goocanvas/default.nix
@@ -9,13 +9,13 @@
   gnome,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "goocanvas";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw";
+    url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor finalAttrs.version}/goocanvas-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-HAcu+IVnytJB+0rd7ibpvZZ0GxUD/3NtHBUvpthlcR4=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
     glib
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "goocanvas";
       versionPolicy = "odd-unstable";
       freeze = true;
     };
@@ -39,4 +41,4 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2;
     platforms = lib.platforms.unix;
   };
-}
+})

From e5357ed567ecf6f41ad871a5c7c163183d8f0c48 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sun, 30 Mar 2025 17:46:39 -0700
Subject: [PATCH 2/2] perlPackages.goocanvas: unbreak on GCC 14

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 10b69fde6708..8f006b8dcdc8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14917,6 +14917,7 @@ with self;
       pkgs.gtk2
       Gtk2
     ];
+    env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=implicit-function-declaration";
     meta = {
       description = "Perl interface to the GooCanvas";
       license = with lib.licenses; [