From f29f0b140b4c666fb2bfef3f39a3007950e5970d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <git@tom94.net>
Date: Thu, 24 Jul 2025 14:12:19 +0200
Subject: [PATCH 1/2] maintainers: add tom94

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index abdcc8560077..d4432f210da3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26253,6 +26253,12 @@
     githubId = 74688871;
     name = "Tochukwu Ahanonu";
   };
+  tom94 = {
+    email = "nix@94.me";
+    github = "Tom94";
+    githubId = 4923655;
+    name = "Thomas Müller";
+  };
   tomahna = {
     email = "kevin.rauscher@tomahna.fr";
     github = "Tomahna";

From f0fb6a65cf3b9fa6a03ed72c84d105c70186f590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <git@tom94.net>
Date: Thu, 24 Jul 2025 14:12:58 +0200
Subject: [PATCH 2/2] tev: 1.29 -> 2.5.2

https://github.com/Tom94/tev/releases/tag/v2.0
https://github.com/Tom94/tev/releases/tag/v2.1
https://github.com/Tom94/tev/releases/tag/v2.2
https://github.com/Tom94/tev/releases/tag/v2.3
https://github.com/Tom94/tev/releases/tag/v2.3.2
https://github.com/Tom94/tev/releases/tag/v2.4.0
https://github.com/Tom94/tev/releases/tag/v2.4.1
https://github.com/Tom94/tev/releases/tag/v2.5.0
https://github.com/Tom94/tev/releases/tag/v2.5.1
https://github.com/Tom94/tev/releases/tag/v2.5.2

Also unbreaks Darwin build, updates metadata to latest, and removes a
few now obsolete dependencies / wrapping.
---
 pkgs/by-name/te/tev/package.nix | 104 +++++++++++++++++---------------
 1 file changed, 57 insertions(+), 47 deletions(-)

diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index e1f6f083482d..085e88bbbd31 100644
--- a/pkgs/by-name/te/tev/package.nix
+++ b/pkgs/by-name/te/tev/package.nix
@@ -1,81 +1,91 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
   cmake,
-  wrapGAppsHook3,
-  libX11,
-  libzip,
-  glfw,
-  libpng,
+  darwin,
+  dbus,
+  fetchFromGitHub,
+  lcms2,
+  libGL,
+  libffi,
+  libxkbcommon,
+  nasm,
+  perl,
+  pkg-config,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
   xorg,
-  zenity,
 }:
 
 stdenv.mkDerivation rec {
   pname = "tev";
-  version = "1.29";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "Tom94";
     repo = "tev";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-ke1T5nOrDoJilpfshAIAFWw/640Gm5OaxZ+ZakCevTs=";
+    hash = "sha256-S4VE33wMima6GeGPmZOU6ub5V/ZWoVYqAIizh9BJHGo=";
   };
 
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux (
+    let
+      waylandLibPath = "${lib.getLib wayland}/lib";
+    in
+    ''
+      substituteInPlace ./dependencies/nanogui/ext/glfw/src/wl_init.c \
+        --replace-fail "libwayland-client.so" "${waylandLibPath}/libwayland-client.so" \
+        --replace-fail "libwayland-cursor.so" "${waylandLibPath}/libwayland-cursor.so" \
+        --replace-fail "libwayland-egl.so" "${waylandLibPath}/libwayland-egl.so" \
+        --replace-fail "libxkbcommon.so" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so"
+    ''
+  );
+
   nativeBuildInputs = [
     cmake
-    wrapGAppsHook3
+    nasm
+    perl
+    pkg-config
   ];
-  buildInputs = [
-    libX11
-    libzip
-    glfw
-    libpng
-  ]
-  ++ (with xorg; [
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXxf86vm
-    libXext
-  ]);
 
-  dontWrapGApps = true; # We also need zenity (see below)
+  buildInputs = [
+    lcms2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
+    libffi
+    libGL
+    libxkbcommon
+    wayland
+    wayland-protocols
+    wayland-scanner
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXrandr
+  ];
 
   cmakeFlags = [
-    "-DTEV_DEPLOY=1" # Only relevant not to append "dev" to the version
+    "-DTEV_DEPLOY=1"
   ];
 
-  postInstall = ''
-    wrapProgram $out/bin/tev \
-      "''${gappsWrapperArgs[@]}" \
-      --prefix PATH ":" "${zenity}/bin"
-  '';
-
-  env.CXXFLAGS = "-include cstdint";
-
   meta = {
-    description = "High dynamic range (HDR) image comparison tool";
+    description = "High dynamic range (HDR) image viewer for people who care about colors";
     mainProgram = "tev";
     longDescription = ''
-      A high dynamic range (HDR) image comparison tool for graphics people. tev
-      allows viewing images through various tonemapping operators and inspecting
-      the values of individual pixels. Often, it is important to find exact
-      differences between pairs of images. For this purpose, tev allows rapidly
-      switching between opened images and visualizing various error metrics (L1,
-      L2, and relative versions thereof). To avoid clutter, opened images and
-      their layers can be filtered by keywords.
-      While the predominantly supported file format is OpenEXR certain other
-      types of images can also be loaded.
+      High dynamic range (HDR) image viewer for people who care about colors. It is
+      - Lightning fast: starts up instantly, loads hundreds of images in seconds.
+      - Accurate: understands color profiles and displays HDR.
+      - Versatile: supports many formats, histograms, pixel peeping, tonemaps, etc.
     '';
-    inherit (src.meta) homepage;
     changelog = "https://github.com/Tom94/tev/releases/tag/v${version}";
-    license = lib.licenses.bsd3;
+    homepage = "https://github.com/Tom94/tev";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ tom94 ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # needs apple frameworks + SDK fix? see #205247
-    maintainers = [ ];
   };
 }