From 29a546bbf5a6f2097e8b71546ef714976493ef87 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Thu, 3 Apr 2025 01:33:40 +0300
Subject: [PATCH 1/2] zint: 2.13.0 -> 2.15.0

---
 pkgs/development/libraries/zint/default.nix | 59 +++++++++++++--------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix
index 8badae678e11..2b5e89f38c33 100644
--- a/pkgs/development/libraries/zint/default.nix
+++ b/pkgs/development/libraries/zint/default.nix
@@ -2,33 +2,45 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  wrapQtAppsHook,
   cmake,
+  ninja,
+  libpng,
   qtbase,
   qtsvg,
   qttools,
-  testers,
-  zint,
+  versionCheckHook,
+  wrapQtAppsHook,
+  zlib,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zint";
-  version = "2.13.0";
+  version = "2.15.0";
+
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ];
 
   src = fetchFromGitHub {
     owner = "zint";
     repo = "zint";
-    rev = version;
-    hash = "sha256-/ILq/7A8Lffe2NuiABiV3KeYXapuL1SO55Qk3wXfC/8=";
+    tag = finalAttrs.version;
+    hash = "sha256-+dXIU66HIS2mE0pa99UemMMFBGCYjupUX8P7q3G7Nis=";
   };
 
-  outputs = [
-    "out"
-    "dev"
-  ];
+  postPatch = ''
+    # Fix cmake file installation
+    # https://github.com/zint/zint/pull/8
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'DESTINATION "''${CMAKE_INSTALL_DATADIR}/zint"' 'DESTINATION lib/cmake/zint'
+    substituteInPlace backend/CMakeLists.txt \
+      --replace-fail 'DESTINATION "''${CMAKE_INSTALL_DATADIR}/zint"' 'DESTINATION lib/cmake/zint'
+  '';
 
   nativeBuildInputs = [
     cmake
+    ninja
     wrapQtAppsHook
   ];
 
@@ -38,7 +50,15 @@ stdenv.mkDerivation rec {
     qttools
   ];
 
-  cmakeFlags = [ "-DZINT_QT6:BOOL=ON" ];
+  propagatedBuildInputs = [
+    libpng
+    zlib
+  ];
+
+  cmakeFlags = [ (lib.cmakeBool "ZINT_QT6" true) ];
+
+  doInstallCheck = true;
+  nativeCheckInputs = [ versionCheckHook ];
 
   postInstall = ''
     install -Dm644 -t $out/share/applications $src/zint-qt.desktop
@@ -46,12 +66,6 @@ stdenv.mkDerivation rec {
     install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/frontend_qt/images/scalable/zint-qt.svg
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = zint;
-    command = "zint --version";
-    inherit version;
-  };
-
   meta = with lib; {
     description = "Barcode generating tool and library";
     longDescription = ''
@@ -61,9 +75,10 @@ stdenv.mkDerivation rec {
       developers access to the capabilities of Zint.
     '';
     homepage = "https://www.zint.org.uk";
-    changelog = "https://github.com/zint/zint/blob/${version}/ChangeLog";
+    changelog = "https://github.com/zint/zint/blob/${finalAttrs.src.rev}/ChangeLog";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ azahi ];
+    maintainers = [ lib.maintainers.azahi ];
     platforms = platforms.all;
+    mainProgram = "zint";
   };
-}
+})

From 767cfab0859b8583c6ed72a8ca8e170a2b714686 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Thu, 3 Apr 2025 01:39:17 +0300
Subject: [PATCH 2/2] zint: move to by-name

---
 .../default.nix => by-name/zi/zint/package.nix}     | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{development/libraries/zint/default.nix => by-name/zi/zint/package.nix} (95%)

diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/by-name/zi/zint/package.nix
similarity index 95%
rename from pkgs/development/libraries/zint/default.nix
rename to pkgs/by-name/zi/zint/package.nix
index 2b5e89f38c33..f38c6277bf56 100644
--- a/pkgs/development/libraries/zint/default.nix
+++ b/pkgs/by-name/zi/zint/package.nix
@@ -5,11 +5,8 @@
   cmake,
   ninja,
   libpng,
-  qtbase,
-  qtsvg,
-  qttools,
+  qt6,
   versionCheckHook,
-  wrapQtAppsHook,
   zlib,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -41,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qttools
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01cee5c744ab..e85c168d4f72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5765,8 +5765,6 @@ with pkgs;
   zpaq = callPackage ../tools/archivers/zpaq { };
   zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
 
-  zint = qt6Packages.callPackage ../development/libraries/zint { };
-
   zstd = callPackage ../tools/compression/zstd {
     cmake = buildPackages.cmakeMinimal;
   };