From 16ecf3195933686d94d9cdf0c88f8348f20553d6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 6 May 2026 13:53:41 +0700
Subject: [PATCH 1/2] nip2: fix build with gcc 15

---
 pkgs/by-name/ni/nip2/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/ni/nip2/package.nix b/pkgs/by-name/ni/nip2/package.nix
index faf3ba81e236..18c70f7314bb 100644
--- a/pkgs/by-name/ni/nip2/package.nix
+++ b/pkgs/by-name/ni/nip2/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   pkg-config,
   glib,
   libxml2,
@@ -25,6 +26,19 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-t14m6z+5lPqpiOjgdDbKwqSWXCyrCL7zlo6BeoZtds0=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "do-not-redeclare-statfs.patch";
+      url = "https://github.com/libvips/nip2/commit/045268a78c40d7f546220504f971c728aebc00be.patch";
+      hash = "sha256-A17+/Vmjf0l1Jpl22VL11gj5m6oFB8DnvkH2EHiRTw8=";
+    })
+    (fetchpatch {
+      name = "declare-function-arguments-for-function-pointer.patch";
+      url = "https://github.com/libvips/nip2/commit/8c60c517b59f806da84d57cb1d083a213b811151.patch";
+      hash = "sha256-o5OHNSbUORGquhyCYCtGQTY74IfroByaa0UAXYsP484=";
+    })
+  ];
+
   nativeBuildInputs = [
     bison
     flex

From e990a2a171a48985e563c53bd0c66f0da0f6fb63 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 6 May 2026 13:56:25 +0700
Subject: [PATCH 2/2] nip2: switch to fetchFromGitHub

---
 pkgs/by-name/ni/nip2/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nip2/package.nix b/pkgs/by-name/ni/nip2/package.nix
index 18c70f7314bb..f20cef494d57 100644
--- a/pkgs/by-name/ni/nip2/package.nix
+++ b/pkgs/by-name/ni/nip2/package.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   fetchpatch,
+  autoreconfHook,
   pkg-config,
   glib,
   libxml2,
@@ -21,9 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "nip2";
   version = "8.9.1";
 
-  src = fetchurl {
-    url = "https://github.com/libvips/nip2/releases/download/v${finalAttrs.version}/nip2-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-t14m6z+5lPqpiOjgdDbKwqSWXCyrCL7zlo6BeoZtds0=";
+  src = fetchFromGitHub {
+    owner = "libvips";
+    repo = "nip2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SemlINqrqzWa7/sU6KnWiDJW8FLSYVZnCDtJNE0wjhg=";
   };
 
   patches = [
@@ -40,12 +43,18 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    autoreconfHook
     bison
     flex
     pkg-config
     makeWrapper
+    glib
   ];
 
+  preAutoreconf = ''
+    glib-gettextize --force --copy
+  '';
+
   buildInputs = [
     glib
     libxml2