From 3fb9672b71c61854fbdddfc8be9c7159d1c1ea55 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Dec 2022 20:23:29 +0100
Subject: [PATCH 1/4] vips: Switch to Meson

Meson is the preferred build system since 8.13.
---
 pkgs/tools/graphics/vips/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 14831c70b047..35d00a97a84a 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -9,8 +9,10 @@
 , python3
 , fetchFromGitHub
 , fetchpatch
-, autoreconfHook
+, meson
+, ninja
 , gtk-doc
+, docbook-xsl-nons
 , gobject-introspection
   # Optional dependencies
 , libjpeg
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
   pname = "vips";
   version = "8.13.3";
 
-  outputs = [ "bin" "out" "man" "dev" ];
+  outputs = [ "bin" "out" "man" "dev" "devdoc" ];
 
   src = fetchFromGitHub {
     owner = "libvips";
@@ -56,8 +58,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    autoreconfHook
+    meson
+    ninja
     gtk-doc
+    docbook-xsl-nons
     gobject-introspection
   ];
 
@@ -95,9 +99,13 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  autoreconfPhase = ''
-    NOCONFIGURE=1 ./autogen.sh
-  '';
+  mesonFlags = [
+    "-Dgtk_doc=true"
+    "-Dcgif=disabled"
+    "-Dspng=disabled"
+    "-Dpdfium=disabled"
+    "-Dnifti=disabled"
+  ];
 
   meta = with lib; {
     homepage = "https://libvips.github.io/libvips/";

From 152204b08cf68bc4f84152e12dddf5b061fea7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 6 Feb 2023 23:05:10 -0800
Subject: [PATCH 2/4] vips: 8.13.3 -> 8.14.1

Diff: https://github.com/libvips/libvips/compare/v8.13.3...v8.14.1

Changelog: https://github.com/libvips/libvips/blob/v8.14.1/ChangeLog
---
 pkgs/tools/graphics/vips/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 35d00a97a84a..2f5ed8aad935 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -8,7 +8,6 @@
 , Foundation
 , python3
 , fetchFromGitHub
-, fetchpatch
 , meson
 , ninja
 , gtk-doc
@@ -40,7 +39,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vips";
-  version = "8.13.3";
+  version = "8.14.1";
 
   outputs = [ "bin" "out" "man" "dev" "devdoc" ];
 
@@ -48,7 +47,7 @@ stdenv.mkDerivation rec {
     owner = "libvips";
     repo = "libvips";
     rev = "v${version}";
-    sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo=";
+    hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -108,6 +107,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog";
     homepage = "https://libvips.github.io/libvips/";
     description = "Image processing system for large images";
     license = licenses.lgpl2Plus;

From b872c2ad6ada8a23e4814fc26fab9f2de3243bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 6 Feb 2023 23:23:33 -0800
Subject: [PATCH 3/4] vips: don't build gtk_doc on Darwin

Otherwise the build hangs.
---
 pkgs/tools/graphics/vips/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 2f5ed8aad935..db44108112f3 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   pname = "vips";
   version = "8.14.1";
 
-  outputs = [ "bin" "out" "man" "dev" "devdoc" ];
+  outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ];
 
   src = fetchFromGitHub {
     owner = "libvips";
@@ -59,9 +59,10 @@ stdenv.mkDerivation rec {
     pkg-config
     meson
     ninja
-    gtk-doc
     docbook-xsl-nons
     gobject-introspection
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    gtk-doc
   ];
 
   buildInputs = [
@@ -99,11 +100,12 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dgtk_doc=true"
     "-Dcgif=disabled"
     "-Dspng=disabled"
     "-Dpdfium=disabled"
     "-Dnifti=disabled"
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    "-Dgtk_doc=true"
   ];
 
   meta = with lib; {

From 1de7179b424a328a534f09184a7f65f2e3882b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 6 Feb 2023 23:29:47 -0800
Subject: [PATCH 4/4] imaginary: fix tests on Darwin

---
 pkgs/servers/imaginary/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/servers/imaginary/default.nix
index cfab6e2e9030..d144969c97e3 100644
--- a/pkgs/servers/imaginary/default.nix
+++ b/pkgs/servers/imaginary/default.nix
@@ -23,6 +23,8 @@ buildGoModule rec {
     "-X main.Version=${version}"
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     homepage = "https://fly.io/docs/app-guides/run-a-global-image-service";
     changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}";