From d921f741f70555c645beaab0eef067a7619db5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anger=20J=C3=A9r=C3=A9my?= <angerj.dev@gmail.com>
Date: Mon, 1 May 2023 09:34:20 +0200
Subject: [PATCH 1/2] maintainers: add kidanger

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4216fff9adb8..8239a5583b42 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8161,6 +8161,12 @@
     githubId = 16481032;
     name = "Kiba Fox";
   };
+  kidanger = {
+    email = "angerj.dev@gmail.com";
+    github = "kidanger";
+    githubId = 297479;
+    name = "Jérémy Anger";
+  };
   kidd = {
     email = "raimonster@gmail.com";
     github = "kidd";

From 88e57d0bb238d296a2b57a21d722ed95f115630e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anger=20J=C3=A9r=C3=A9my?= <angerj.dev@gmail.com>
Date: Sun, 30 Apr 2023 22:10:36 +0200
Subject: [PATCH 2/2] vpv: init at 0.8.1

---
 pkgs/applications/graphics/vpv/default.nix | 63 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/graphics/vpv/default.nix

diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/applications/graphics/vpv/default.nix
new file mode 100644
index 000000000000..724dd25f8f88
--- /dev/null
+++ b/pkgs/applications/graphics/vpv/default.nix
@@ -0,0 +1,63 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, libpng
+, libtiff
+, libjpeg
+, SDL2
+, gdal
+, octave
+, rustPlatform
+, cargo
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vpv";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "kidanger";
+    repo = "vpv";
+    rev = "v${finalAttrs.version}";
+    sha256 = "0cphgq1pqmwrjdmq524j5y522iaq6yhp2dpjdv0a3f9558dayxix";
+  };
+
+  cargoRoot = "src/fuzzy-finder";
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    src = finalAttrs.src;
+    sourceRoot = "source/src/fuzzy-finder";
+    hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    rustPlatform.cargoSetupHook
+    cargo
+  ];
+
+  buildInputs = [
+    libpng
+    libtiff
+    libjpeg
+    SDL2
+    gdal
+    octave
+  ];
+
+  cmakeFlags = [
+    "-DUSE_GDAL=ON"
+    "-DUSE_OCTAVE=ON"
+    "-DVPV_VERSION=v${finalAttrs.version}"
+    "-DBUILD_TESTING=ON"
+  ];
+
+  meta = {
+    homepage = "https://github.com/kidanger/vpv";
+    description = "Image viewer for image processing experts";
+    maintainers = [ lib.maintainers.kidanger ];
+    license = lib.licenses.gpl3;
+    broken = stdenv.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc7d6e1c42bb..0d535f36efd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34714,6 +34714,8 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
+  vpv = callPackage ../applications/graphics/vpv { };
+
   vsce = callPackage ../development/tools/vsce { };
 
   vscode = callPackage ../applications/editors/vscode/vscode.nix { };