From 08b4d4936d5678dc84fbc9dc839eb0bccd29283a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 20:40:46 +0800
Subject: [PATCH 1/3] tiv: 1.1.1 -> 1.2.1

Diff: https://github.com/stefanhaustein/TerminalImageViewer/compare/v1.1.1...v1.2.1
---
 pkgs/by-name/ti/tiv/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix
index b2347948d2e8..4ee9ff92a54f 100644
--- a/pkgs/by-name/ti/tiv/package.nix
+++ b/pkgs/by-name/ti/tiv/package.nix
@@ -8,23 +8,23 @@
 
 stdenv.mkDerivation rec {
   pname = "tiv";
-  version = "1.1.1";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "stefanhaustein";
     repo = "TerminalImageViewer";
-    rev = "v${version}";
-    sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0=";
+    tag = "v${version}";
+    hash = "sha256-xuJpl/tGWlyo8aKKy0yYzGladLs3ayKcRCodDNyZI9w=";
   };
 
+  sourceRoot = "${src.name}/src";
+
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [ imagemagick ];
 
   makeFlags = [ "prefix=$(out)" ];
 
-  preConfigure = "cd src/main/cpp";
-
   postFixup = ''
     wrapProgram $out/bin/tiv \
       --prefix PATH : ${lib.makeBinPath [ imagemagick ]}

From 9a76775412c6d01ea2342262606ef4da19bfd45e Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 20:43:54 +0800
Subject: [PATCH 2/3] tiv: use finalAttrs

---
 pkgs/by-name/ti/tiv/package.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix
index 4ee9ff92a54f..6f1b986d749b 100644
--- a/pkgs/by-name/ti/tiv/package.nix
+++ b/pkgs/by-name/ti/tiv/package.nix
@@ -2,28 +2,26 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  makeWrapper,
+  makeBinaryWrapper,
   imagemagick,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tiv";
   version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "stefanhaustein";
     repo = "TerminalImageViewer";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xuJpl/tGWlyo8aKKy0yYzGladLs3ayKcRCodDNyZI9w=";
   };
 
-  sourceRoot = "${src.name}/src";
+  sourceRoot = "${finalAttrs.src.name}/src";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
-  buildInputs = [ imagemagick ];
-
-  makeFlags = [ "prefix=$(out)" ];
+  makeFlags = [ "prefix=${placeholder "out"}" ];
 
   postFixup = ''
     wrapProgram $out/bin/tiv \
@@ -38,4 +36,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ magnetophon ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})

From 8168908b793a0545f95a7b3fb2856fd93b8d8971 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 20:44:25 +0800
Subject: [PATCH 3/3] tiv: remove with lib

---
 pkgs/by-name/ti/tiv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tiv/package.nix b/pkgs/by-name/ti/tiv/package.nix
index 6f1b986d749b..5d474c66039d 100644
--- a/pkgs/by-name/ti/tiv/package.nix
+++ b/pkgs/by-name/ti/tiv/package.nix
@@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix PATH : ${lib.makeBinPath [ imagemagick ]}
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/stefanhaustein/TerminalImageViewer";
     description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters";
     mainProgram = "tiv";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ magnetophon ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ magnetophon ];
     platforms = [ "x86_64-linux" ];
   };
 })