Merge pull request #215358 from azahi/zint-2.12.0

zint: 2.11.1 -> 2.12.0
2024-11-24 07:53:19 +00:00 · 2023-02-09 08:29:57 +08:00 · 2023-02-09 08:29:57 +08:00 · 53d5dddac8
commit 53d5dddac8
parent 9da1cffb1f 9a5395c476
2 changed files with 2 additions and 16 deletions
--- a/pkgs/development/libraries/zint/default.nix
+++ b/pkgs/development/libraries/zint/default.nix
@ -12,17 +12,15 @@

 stdenv.mkDerivation rec {
  pname = "zint";
-  version = "2.11.1";
+  version = "2.12.0";

  src = fetchFromGitHub {
    owner = "zint";
    repo = "zint";
    rev = version;
-    sha256 = "sha256-ozhXy7ftmGz1XvmF8AS1ifWJ3Q5hLSsysB8qLUP60n8=";
+    hash = "sha256-Ay6smir6zUpadmw1WpU+F7e9t7Gk3JNVtf2VVu92bDk=";
  };

-  patches = [ ./qobject.patch ];
-
  outputs = [ "out" "dev" ];

  nativeBuildInputs = [ cmake wrapQtAppsHook ];
--- a/pkgs/development/libraries/zint/qobject.patch
+++ b/pkgs/development/libraries/zint/qobject.patch
@ -1,12 +0,0 @@
-diff --git a/backend_qt/qzint.h b/backend_qt/qzint.h
-index d57ab6a..62fb0a4 100644
--- a/backend_qt/qzint.h
-+++ b/backend_qt/qzint.h
-@@ -19,6 +19,7 @@
- #ifndef QZINT_H
- #define QZINT_H
- 
-+#include <QObject>
- #include <QColor>
- #include <QPainter>
- #include "zint.h"